From 77ba9463064411f422d52dbbfe11359fd5c970f8 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 5 Jan 2016 04:47:35 +0100 Subject: [PATCH] Added an API. --- .../de/ellpeck/actuallyadditions/PLANNED.txt | 151 --------- .../api/ActuallyAdditionsAPI.java | 152 +++++++++ .../{util => api}/Position.java | 5 +- .../{blocks => api/block}/IHudDisplay.java | 5 +- .../api/lens/IAtomicReconstructor.java | 50 +++ .../actuallyadditions/api/lens/ILensItem.java | 22 ++ .../actuallyadditions/api/lens/Lens.java | 60 ++++ .../actuallyadditions/api/package-info.java | 13 + .../api/recipe/BallOfFurReturn.java | 25 ++ .../api/recipe/CrusherRecipe.java | 125 ++++++++ .../api/recipe/LensNoneRecipe.java | 87 ++++++ .../api/recipe/TreasureChestLoot.java | 29 ++ .../api/recipe/coffee/CoffeeBrewing.java | 107 +++++++ .../api/recipe/coffee/CoffeeIngredient.java | 39 +++ .../{ => api}/tile/IEnergyDisplay.java | 5 +- .../{ => api}/tile/IPhantomTile.java | 10 +- .../crafting/CrusherCrafting.java | 108 ------- .../actuallyadditions/items/ItemCoffee.java | 289 ------------------ .../actuallyadditions/items/lens/Lens.java | 35 --- .../items/lens/LensNoneRecipeHandler.java | 186 ----------- .../{ => mod}/ActuallyAdditions.java | 64 ++-- .../achievement/InitAchievements.java | 6 +- .../achievement/TheAchievements.java | 8 +- .../blocks/BlockAtomicReconstructor.java | 17 +- .../{ => mod}/blocks/BlockBlackLotus.java | 6 +- .../{ => mod}/blocks/BlockBookletStand.java | 19 +- .../{ => mod}/blocks/BlockBreaker.java | 12 +- .../{ => mod}/blocks/BlockCanolaPress.java | 12 +- .../{ => mod}/blocks/BlockCoalGenerator.java | 14 +- .../{ => mod}/blocks/BlockCoffeeMachine.java | 12 +- .../{ => mod}/blocks/BlockColoredLamp.java | 12 +- .../{ => mod}/blocks/BlockCompost.java | 17 +- .../{ => mod}/blocks/BlockCrystal.java | 12 +- .../blocks/BlockDirectionalBreaker.java | 12 +- .../{ => mod}/blocks/BlockDropper.java | 12 +- .../{ => mod}/blocks/BlockEnergizer.java | 14 +- .../{ => mod}/blocks/BlockFeeder.java | 12 +- .../blocks/BlockFermentingBarrel.java | 12 +- .../{ => mod}/blocks/BlockFireworkBox.java | 8 +- .../{ => mod}/blocks/BlockFishingNet.java | 8 +- .../{ => mod}/blocks/BlockFluidCollector.java | 12 +- .../{ => mod}/blocks/BlockFurnaceDouble.java | 14 +- .../{ => mod}/blocks/BlockFurnaceSolar.java | 8 +- .../{ => mod}/blocks/BlockGeneric.java | 6 +- .../{ => mod}/blocks/BlockGiantChest.java | 16 +- .../blocks/BlockGreenhouseGlass.java | 8 +- .../{ => mod}/blocks/BlockGrinder.java | 14 +- .../{ => mod}/blocks/BlockHeatCollector.java | 8 +- .../{ => mod}/blocks/BlockInputter.java | 20 +- .../{ => mod}/blocks/BlockItemRepairer.java | 12 +- .../{ => mod}/blocks/BlockLampPowerer.java | 10 +- .../{ => mod}/blocks/BlockLaserRelay.java | 8 +- .../blocks/BlockLavaFactoryController.java | 11 +- .../{ => mod}/blocks/BlockLeafGenerator.java | 8 +- .../{ => mod}/blocks/BlockMiner.java | 15 +- .../{ => mod}/blocks/BlockMisc.java | 14 +- .../{ => mod}/blocks/BlockOilGenerator.java | 14 +- .../{ => mod}/blocks/BlockPhantom.java | 16 +- .../{ => mod}/blocks/BlockPhantomBooster.java | 8 +- .../blocks/BlockRangedCollector.java | 12 +- .../{ => mod}/blocks/BlockSlabs.java | 6 +- .../{ => mod}/blocks/BlockSmileyCloud.java | 16 +- .../{ => mod}/blocks/BlockTreasureChest.java | 15 +- .../{ => mod}/blocks/BlockWildPlant.java | 12 +- .../{ => mod}/blocks/BlockXPSolidifier.java | 16 +- .../{ => mod}/blocks/FluidAA.java | 4 +- .../{ => mod}/blocks/InitBlocks.java | 18 +- .../{ => mod}/blocks/base/BlockBase.java | 6 +- .../{ => mod}/blocks/base/BlockBushBase.java | 6 +- .../blocks/base/BlockContainerBase.java | 10 +- .../blocks/base/BlockFluidFlowing.java | 6 +- .../{ => mod}/blocks/base/BlockPlant.java | 6 +- .../{ => mod}/blocks/base/BlockStair.java | 6 +- .../{ => mod}/blocks/base/BlockWallAA.java | 6 +- .../{ => mod}/blocks/base/ItemBlockBase.java | 4 +- .../metalists/TheColoredLampColors.java | 4 +- .../blocks/metalists/TheMiscBlocks.java | 2 +- .../blocks/metalists/TheWildPlants.java | 4 +- .../blocks/render/RenderInventory.java | 2 +- .../blocks/render/RenderLaserRelay.java | 4 +- .../render/RenderReconstructorLens.java | 10 +- .../blocks/render/RenderSmileyCloud.java | 16 +- .../blocks/render/RenderTileEntity.java | 6 +- .../blocks/render/model/ModelBaseAA.java | 2 +- .../render/model/ModelBookletStand.java | 2 +- .../render/model/ModelCoffeeMachine.java | 2 +- .../blocks/render/model/ModelCompost.java | 6 +- .../blocks/render/model/ModelFishingNet.java | 2 +- .../render/model/ModelFurnaceSolar.java | 2 +- .../blocks/render/model/ModelLaserRelay.java | 2 +- .../render/model/ModelPhantomBooster.java | 2 +- .../blocks/render/model/ModelSmileyCloud.java | 2 +- .../{ => mod}/booklet/BookletUtils.java | 20 +- .../{ => mod}/booklet/EntrySet.java | 8 +- .../{ => mod}/booklet/GuiAAAchievements.java | 4 +- .../{ => mod}/booklet/GuiBooklet.java | 26 +- .../{ => mod}/booklet/GuiBookletStand.java | 10 +- .../{ => mod}/booklet/InitBooklet.java | 38 +-- .../booklet/button/BookmarkButton.java | 14 +- .../{ => mod}/booklet/button/IndexButton.java | 8 +- .../booklet/button/TexturedButton.java | 4 +- .../booklet/chapter/BookletChapter.java | 12 +- .../booklet/chapter/BookletChapterCoffee.java | 14 +- .../chapter/BookletChapterCrusher.java | 14 +- .../{ => mod}/booklet/entry/BookletEntry.java | 10 +- .../booklet/entry/BookletEntryAllSearch.java | 4 +- .../{ => mod}/booklet/page/BookletPage.java | 16 +- .../booklet/page/PageCoffeeRecipe.java | 25 +- .../{ => mod}/booklet/page/PageCrafting.java | 14 +- .../booklet/page/PageCrusherRecipe.java | 20 +- .../{ => mod}/booklet/page/PageFurnace.java | 14 +- .../{ => mod}/booklet/page/PagePicture.java | 8 +- .../booklet/page/PageReconstructor.java | 30 +- .../{ => mod}/booklet/page/PageTextOnly.java | 6 +- .../{ => mod}/config/ConfigCategories.java | 2 +- .../{ => mod}/config/ConfigValues.java | 8 +- .../config/ConfigurationHandler.java | 6 +- .../{ => mod}/config/GuiConfiguration.java | 4 +- .../{ => mod}/config/GuiFactory.java | 2 +- .../config/values/ConfigBoolValues.java | 6 +- .../config/values/ConfigCrafting.java | 4 +- .../config/values/ConfigIntValues.java | 4 +- .../{ => mod}/crafting/BlockCrafting.java | 18 +- .../mod/crafting/CrusherCrafting.java | 110 +++++++ .../{ => mod}/crafting/FoodCrafting.java | 12 +- .../{ => mod}/crafting/InitCrafting.java | 4 +- .../{ => mod}/crafting/ItemCrafting.java | 18 +- .../{ => mod}/crafting/MiscCrafting.java | 16 +- .../{ => mod}/crafting/ToolCrafting.java | 12 +- .../{ => mod}/creative/CreativeTab.java | 10 +- .../{ => mod}/event/BucketFillEvent.java | 6 +- .../{ => mod}/event/EntityLivingEvent.java | 10 +- .../{ => mod}/event/HudEvent.java | 12 +- .../{ => mod}/event/InitEvents.java | 12 +- .../{ => mod}/event/LivingDropEvent.java | 10 +- .../{ => mod}/event/LogoutEvent.java | 4 +- .../{ => mod}/event/PlayerObtainEvents.java | 16 +- .../{ => mod}/event/TooltipEvent.java | 10 +- .../{ => mod}/event/WorldDecorationEvent.java | 16 +- .../{ => mod}/event/WorldLoadingEvents.java | 6 +- .../{ => mod}/gen/InitVillager.java | 12 +- .../gen/JamVillagerTradeHandler.java | 6 +- .../{ => mod}/gen/OreGen.java | 14 +- .../gen/VillageComponentCustomCropField.java | 4 +- .../gen/VillageComponentJamHouse.java | 4 +- .../gen/VillageCustomCropFieldHandler.java | 2 +- .../{ => mod}/gen/VillageJamHouseHandler.java | 2 +- .../{ => mod}/inventory/ContainerBreaker.java | 6 +- .../inventory/ContainerCanolaPress.java | 14 +- .../inventory/ContainerCoalGenerator.java | 6 +- .../inventory/ContainerCoffeeMachine.java | 14 +- .../{ => mod}/inventory/ContainerCrafter.java | 2 +- .../ContainerDirectionalBreaker.java | 6 +- .../{ => mod}/inventory/ContainerDrill.java | 8 +- .../{ => mod}/inventory/ContainerDropper.java | 6 +- .../inventory/ContainerEnergizer.java | 8 +- .../inventory/ContainerEnervator.java | 8 +- .../{ => mod}/inventory/ContainerFeeder.java | 6 +- .../inventory/ContainerFermentingBarrel.java | 10 +- .../inventory/ContainerFluidCollector.java | 8 +- .../inventory/ContainerFurnaceDouble.java | 6 +- .../inventory/ContainerGiantChest.java | 6 +- .../{ => mod}/inventory/ContainerGrinder.java | 10 +- .../inventory/ContainerInputter.java | 10 +- .../{ => mod}/inventory/ContainerMiner.java | 6 +- .../inventory/ContainerOilGenerator.java | 10 +- .../inventory/ContainerPhantomPlacer.java | 6 +- .../inventory/ContainerRangedCollector.java | 8 +- .../inventory/ContainerRepairer.java | 8 +- .../inventory/ContainerSmileyCloud.java | 2 +- .../inventory/ContainerXPSolidifier.java | 8 +- .../{ => mod}/inventory/GuiHandler.java | 14 +- .../{ => mod}/inventory/gui/GuiBreaker.java | 10 +- .../inventory/gui/GuiCanolaPress.java | 12 +- .../inventory/gui/GuiCoalGenerator.java | 10 +- .../inventory/gui/GuiCoffeeMachine.java | 18 +- .../{ => mod}/inventory/gui/GuiCrafter.java | 8 +- .../inventory/gui/GuiDirectionalBreaker.java | 10 +- .../{ => mod}/inventory/gui/GuiDrill.java | 8 +- .../{ => mod}/inventory/gui/GuiDropper.java | 10 +- .../{ => mod}/inventory/gui/GuiEnergizer.java | 10 +- .../{ => mod}/inventory/gui/GuiEnervator.java | 10 +- .../{ => mod}/inventory/gui/GuiFeeder.java | 14 +- .../inventory/gui/GuiFermentingBarrel.java | 12 +- .../inventory/gui/GuiFluidCollector.java | 12 +- .../inventory/gui/GuiFurnaceDouble.java | 10 +- .../inventory/gui/GuiGiantChest.java | 10 +- .../{ => mod}/inventory/gui/GuiGrinder.java | 10 +- .../{ => mod}/inventory/gui/GuiInputter.java | 20 +- .../{ => mod}/inventory/gui/GuiMiner.java | 16 +- .../inventory/gui/GuiOilGenerator.java | 12 +- .../inventory/gui/GuiPhantomPlacer.java | 10 +- .../inventory/gui/GuiRangedCollector.java | 18 +- .../{ => mod}/inventory/gui/GuiRepairer.java | 10 +- .../inventory/gui/GuiSmileyCloud.java | 18 +- .../inventory/gui/GuiXPSolidifier.java | 16 +- .../{ => mod}/inventory/slot/SlotFilter.java | 2 +- .../inventory/slot/SlotImmovable.java | 2 +- .../{ => mod}/inventory/slot/SlotOutput.java | 2 +- .../{ => mod}/items/InitForeignPaxels.java | 18 +- .../{ => mod}/items/InitItems.java | 26 +- .../{ => mod}/items/ItemBattery.java | 6 +- .../{ => mod}/items/ItemBooklet.java | 28 +- .../items/ItemChestToCrateUpgrade.java | 10 +- .../mod/items/ItemCoffee.java | 179 +++++++++++ .../{ => mod}/items/ItemCoffeeBean.java | 6 +- .../{ => mod}/items/ItemCrafterOnAStick.java | 10 +- .../{ => mod}/items/ItemCrystal.java | 10 +- .../{ => mod}/items/ItemDrill.java | 18 +- .../{ => mod}/items/ItemDrillUpgrade.java | 6 +- .../{ => mod}/items/ItemDust.java | 10 +- .../{ => mod}/items/ItemFertilizer.java | 6 +- .../{ => mod}/items/ItemFoods.java | 10 +- .../{ => mod}/items/ItemGeneric.java | 6 +- .../{ => mod}/items/ItemGrowthRing.java | 10 +- .../{ => mod}/items/ItemHairyBall.java | 13 +- .../{ => mod}/items/ItemJams.java | 10 +- .../{ => mod}/items/ItemKnife.java | 6 +- .../{ => mod}/items/ItemLaserWrench.java | 14 +- .../{ => mod}/items/ItemLeafBlower.java | 10 +- .../{ => mod}/items/ItemMagnetRing.java | 6 +- .../{ => mod}/items/ItemMisc.java | 10 +- .../{ => mod}/items/ItemPhantomConnector.java | 14 +- .../{ => mod}/items/ItemPotionRing.java | 10 +- .../{ => mod}/items/ItemResonantRice.java | 6 +- .../{ => mod}/items/ItemSeed.java | 8 +- .../items/ItemSolidifiedExperience.java | 6 +- .../{ => mod}/items/ItemTeleStaff.java | 8 +- .../{ => mod}/items/ItemWaterRemovalRing.java | 6 +- .../{ => mod}/items/ItemWingsOfTheBats.java | 6 +- .../{ => mod}/items/base/ItemAllToolAA.java | 10 +- .../{ => mod}/items/base/ItemArmorAA.java | 8 +- .../{ => mod}/items/base/ItemAxeAA.java | 8 +- .../{ => mod}/items/base/ItemBase.java | 6 +- .../{ => mod}/items/base/ItemBucketAA.java | 6 +- .../{ => mod}/items/base/ItemEnergy.java | 6 +- .../{ => mod}/items/base/ItemFoodBase.java | 6 +- .../{ => mod}/items/base/ItemHoeAA.java | 8 +- .../{ => mod}/items/base/ItemPickaxeAA.java | 8 +- .../{ => mod}/items/base/ItemShovelAA.java | 8 +- .../{ => mod}/items/base/ItemSwordAA.java | 10 +- .../{ => mod}/items/lens/ItemLens.java | 13 +- .../{ => mod}/items/lens/LensColor.java | 23 +- .../{ => mod}/items/lens/LensDeath.java | 15 +- .../{ => mod}/items/lens/LensDetonation.java | 15 +- .../{ => mod}/items/lens/LensNone.java | 26 +- .../mod/items/lens/LensNoneRecipeHandler.java | 106 +++++++ .../{ => mod}/items/lens/Lenses.java | 6 +- .../items/metalists/TheCrystals.java | 4 +- .../{ => mod}/items/metalists/TheDusts.java | 4 +- .../{ => mod}/items/metalists/TheFoods.java | 4 +- .../{ => mod}/items/metalists/TheJams.java | 2 +- .../items/metalists/TheMiscItems.java | 2 +- .../items/metalists/ThePotionRings.java | 2 +- .../material/InitArmorMaterials.java | 4 +- .../{ => mod}/material/InitToolMaterials.java | 4 +- .../{ => mod}/misc/DamageSources.java | 8 +- .../misc/DispenserHandlerEmptyBucket.java | 2 +- .../misc/DispenserHandlerFertilize.java | 2 +- .../misc/DispenserHandlerFillBucket.java | 2 +- .../{ => mod}/misc/DungeonLoot.java | 14 +- .../misc/EntityColoredParticleFX.java | 2 +- .../misc/LaserRelayConnectionHandler.java | 10 +- .../{ => mod}/misc/WorldData.java | 6 +- .../misc/cloud/ISmileyCloudEasterEgg.java | 2 +- .../misc/cloud/SmileyCloudEasterEggs.java | 12 +- .../{ => mod}/misc/special/RenderSpecial.java | 6 +- .../misc/special/SpecialRenderInit.java | 6 +- .../misc/special/ThreadSpecialFetcher.java | 4 +- .../{ => mod}/nei/INEIRecipeHandler.java | 4 +- .../nei/NEIActuallyAdditionsConfig.java | 10 +- .../{ => mod}/nei/NEIBookletRecipe.java | 18 +- .../{ => mod}/nei/NEICoffeeMachineRecipe.java | 43 +-- .../{ => mod}/nei/NEICompostRecipe.java | 18 +- .../{ => mod}/nei/NEICrusherRecipe.java | 25 +- .../{ => mod}/nei/NEIFurnaceDoubleRecipe.java | 14 +- .../{ => mod}/nei/NEIHairyBallRecipe.java | 38 +-- .../{ => mod}/nei/NEIReconstructorRecipe.java | 37 +-- .../{ => mod}/nei/NEIScreenEvents.java | 16 +- .../{ => mod}/nei/NEITreasureChestRecipe.java | 38 +-- .../network/PacketBookletStandButton.java | 8 +- .../{ => mod}/network/PacketHandler.java | 10 +- .../{ => mod}/network/PacketParticle.java | 4 +- .../network/VanillaPacketSyncer.java | 2 +- .../{ => mod}/network/gui/IButtonReactor.java | 2 +- .../{ => mod}/network/gui/INumberReactor.java | 2 +- .../{ => mod}/network/gui/IStringReactor.java | 2 +- .../network/gui/PacketGuiButton.java | 2 +- .../network/gui/PacketGuiNumber.java | 2 +- .../network/gui/PacketGuiString.java | 2 +- .../{ => mod}/ore/InitOreDict.java | 18 +- .../{ => mod}/proxy/ClientProxy.java | 22 +- .../{ => mod}/proxy/IProxy.java | 2 +- .../{ => mod}/proxy/ServerProxy.java | 4 +- .../mod/recipe/CrusherRecipeRegistry.java | 124 ++++++++ .../{ => mod}/recipe/FuelHandler.java | 12 +- .../mod/recipe/HairyBallHandler.java | 48 +++ .../mod/recipe/TreasureChestHandler.java | 56 ++++ .../{ => mod}/tile/IEnergySaver.java | 2 +- .../{ => mod}/tile/IFluidSaver.java | 2 +- .../{ => mod}/tile/IRedstoneToggle.java | 2 +- .../tile/TileEntityAtomicReconstructor.java | 48 ++- .../{ => mod}/tile/TileEntityBase.java | 8 +- .../tile/TileEntityBookletStand.java | 4 +- .../{ => mod}/tile/TileEntityBreaker.java | 6 +- .../{ => mod}/tile/TileEntityCanolaPress.java | 10 +- .../tile/TileEntityCoalGenerator.java | 4 +- .../tile/TileEntityCoffeeMachine.java | 17 +- .../{ => mod}/tile/TileEntityCompost.java | 10 +- .../tile/TileEntityDirectionalBreaker.java | 6 +- .../{ => mod}/tile/TileEntityDropper.java | 4 +- .../{ => mod}/tile/TileEntityEnergizer.java | 2 +- .../{ => mod}/tile/TileEntityEnervator.java | 4 +- .../{ => mod}/tile/TileEntityFeeder.java | 4 +- .../tile/TileEntityFermentingBarrel.java | 6 +- .../{ => mod}/tile/TileEntityFireworkBox.java | 5 +- .../{ => mod}/tile/TileEntityFishingNet.java | 6 +- .../tile/TileEntityFluidCollector.java | 6 +- .../tile/TileEntityFurnaceDouble.java | 2 +- .../tile/TileEntityFurnaceSolar.java | 5 +- .../{ => mod}/tile/TileEntityGiantChest.java | 2 +- .../tile/TileEntityGreenhouseGlass.java | 6 +- .../{ => mod}/tile/TileEntityGrinder.java | 8 +- .../tile/TileEntityHeatCollector.java | 9 +- .../{ => mod}/tile/TileEntityInputter.java | 8 +- .../tile/TileEntityInventoryBase.java | 4 +- .../tile/TileEntityItemRepairer.java | 2 +- .../{ => mod}/tile/TileEntityLaserRelay.java | 16 +- .../tile/TileEntityLavaFactoryController.java | 9 +- .../tile/TileEntityLeafGenerator.java | 11 +- .../{ => mod}/tile/TileEntityMiner.java | 13 +- .../tile/TileEntityOilGenerator.java | 6 +- .../tile/TileEntityPhantomBooster.java | 2 +- .../tile/TileEntityPhantomEnergyface.java | 6 +- .../tile/TileEntityPhantomItemface.java | 4 +- .../tile/TileEntityPhantomLiquiface.java | 6 +- .../tile/TileEntityPhantomPlacer.java | 13 +- .../{ => mod}/tile/TileEntityPhantomface.java | 13 +- .../tile/TileEntityRangedCollector.java | 6 +- .../{ => mod}/tile/TileEntitySmileyCloud.java | 4 +- .../tile/TileEntityXPSolidifier.java | 8 +- .../{ => mod}/update/ThreadUpdateChecker.java | 4 +- .../{ => mod}/update/UpdateChecker.java | 8 +- .../UpdateCheckerClientNotificationEvent.java | 6 +- .../{ => mod}/util/AssetUtil.java | 4 +- .../{ => mod}/util/CompatUtil.java | 4 +- .../{ => mod}/util/FakePlayerUtil.java | 2 +- .../{ => mod}/util/ItemUtil.java | 2 +- .../{ => mod}/util/KeyUtil.java | 2 +- .../{ => mod}/util/ModUtil.java | 2 +- .../{ => mod}/util/StringUtil.java | 2 +- .../{ => mod}/util/Util.java | 16 +- .../{ => mod}/util/WorldUtil.java | 3 +- .../util/playerdata/PersistentClientData.java | 12 +- .../util/playerdata/PersistentServerData.java | 2 +- .../recipe/CrusherRecipeRegistry.java | 255 ---------------- .../recipe/HairyBallHandler.java | 69 ----- .../recipe/TreasureChestHandler.java | 82 ----- 358 files changed, 2960 insertions(+), 2729 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/PLANNED.txt create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java rename src/main/java/de/ellpeck/actuallyadditions/{util => api}/Position.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{blocks => api/block}/IHudDisplay.java (86%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/lens/IAtomicReconstructor.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/package-info.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensNoneRecipe.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeBrewing.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeIngredient.java rename src/main/java/de/ellpeck/actuallyadditions/{ => api}/tile/IEnergyDisplay.java (77%) rename src/main/java/de/ellpeck/actuallyadditions/{ => api}/tile/IPhantomTile.java (78%) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/crafting/CrusherCrafting.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffee.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/items/lens/Lens.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/ActuallyAdditions.java (67%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/achievement/InitAchievements.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/achievement/TheAchievements.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockAtomicReconstructor.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockBlackLotus.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockBookletStand.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockBreaker.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockCanolaPress.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockCoalGenerator.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockCoffeeMachine.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockColoredLamp.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockCompost.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockCrystal.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockDirectionalBreaker.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockDropper.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockEnergizer.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFeeder.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFermentingBarrel.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFireworkBox.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFishingNet.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFluidCollector.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFurnaceDouble.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockFurnaceSolar.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockGeneric.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockGiantChest.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockGreenhouseGlass.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockGrinder.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockHeatCollector.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockInputter.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockItemRepairer.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockLampPowerer.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockLaserRelay.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockLavaFactoryController.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockLeafGenerator.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockMiner.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockMisc.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockOilGenerator.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockPhantom.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockPhantomBooster.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockRangedCollector.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockSlabs.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockSmileyCloud.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockTreasureChest.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockWildPlant.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/BlockXPSolidifier.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/FluidAA.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/InitBlocks.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockBase.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockBushBase.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockContainerBase.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockFluidFlowing.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockPlant.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockStair.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/BlockWallAA.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/base/ItemBlockBase.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/metalists/TheColoredLampColors.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/metalists/TheMiscBlocks.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/metalists/TheWildPlants.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/RenderInventory.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/RenderLaserRelay.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/RenderReconstructorLens.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/RenderSmileyCloud.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/RenderTileEntity.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelBaseAA.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelBookletStand.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelCoffeeMachine.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelCompost.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelFishingNet.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelFurnaceSolar.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelLaserRelay.java (99%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelPhantomBooster.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/blocks/render/model/ModelSmileyCloud.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/BookletUtils.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/EntrySet.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/GuiAAAchievements.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/GuiBooklet.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/GuiBookletStand.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/InitBooklet.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/button/BookmarkButton.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/button/IndexButton.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/button/TexturedButton.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/chapter/BookletChapter.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/chapter/BookletChapterCoffee.java (69%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/chapter/BookletChapterCrusher.java (70%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/entry/BookletEntry.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/entry/BookletEntryAllSearch.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/BookletPage.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PageCoffeeRecipe.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PageCrafting.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PageCrusherRecipe.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PageFurnace.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PagePicture.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PageReconstructor.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/booklet/page/PageTextOnly.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/ConfigCategories.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/ConfigValues.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/ConfigurationHandler.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/GuiConfiguration.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/GuiFactory.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/values/ConfigBoolValues.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/values/ConfigCrafting.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/config/values/ConfigIntValues.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/crafting/BlockCrafting.java (98%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/crafting/FoodCrafting.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/crafting/InitCrafting.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/crafting/ItemCrafting.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/crafting/MiscCrafting.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/crafting/ToolCrafting.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/creative/CreativeTab.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/BucketFillEvent.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/EntityLivingEvent.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/HudEvent.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/InitEvents.java (78%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/LivingDropEvent.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/LogoutEvent.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/PlayerObtainEvents.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/TooltipEvent.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/WorldDecorationEvent.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/event/WorldLoadingEvents.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/InitVillager.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/JamVillagerTradeHandler.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/OreGen.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/VillageComponentCustomCropField.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/VillageComponentJamHouse.java (99%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/VillageCustomCropFieldHandler.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/gen/VillageJamHouseHandler.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerBreaker.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerCanolaPress.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerCoalGenerator.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerCoffeeMachine.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerCrafter.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerDirectionalBreaker.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerDrill.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerDropper.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerEnergizer.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerEnervator.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerFeeder.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerFermentingBarrel.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerFluidCollector.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerFurnaceDouble.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerGiantChest.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerGrinder.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerInputter.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerMiner.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerOilGenerator.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerPhantomPlacer.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerRangedCollector.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerRepairer.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerSmileyCloud.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/ContainerXPSolidifier.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/GuiHandler.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiBreaker.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiCanolaPress.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiCoalGenerator.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiCoffeeMachine.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiCrafter.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiDirectionalBreaker.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiDrill.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiDropper.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiEnergizer.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiEnervator.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiFeeder.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiFermentingBarrel.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiFluidCollector.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiFurnaceDouble.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiGiantChest.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiGrinder.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiInputter.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiMiner.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiOilGenerator.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiPhantomPlacer.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiRangedCollector.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiRepairer.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiSmileyCloud.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/gui/GuiXPSolidifier.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/slot/SlotFilter.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/slot/SlotImmovable.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/inventory/slot/SlotOutput.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/InitForeignPaxels.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/InitItems.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemBattery.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemBooklet.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemChestToCrateUpgrade.java (92%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemCoffeeBean.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemCrafterOnAStick.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemCrystal.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemDrill.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemDrillUpgrade.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemDust.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemFertilizer.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemFoods.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemGeneric.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemGrowthRing.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemHairyBall.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemJams.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemKnife.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemLaserWrench.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemLeafBlower.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemMagnetRing.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemMisc.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemPhantomConnector.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemPotionRing.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemResonantRice.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemSeed.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemSolidifiedExperience.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemTeleStaff.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemWaterRemovalRing.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/ItemWingsOfTheBats.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemAllToolAA.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemArmorAA.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemAxeAA.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemBase.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemBucketAA.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemEnergy.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemFoodBase.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemHoeAA.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemPickaxeAA.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemShovelAA.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/base/ItemSwordAA.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/lens/ItemLens.java (76%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/lens/LensColor.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/lens/LensDeath.java (77%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/lens/LensDetonation.java (71%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/lens/LensNone.java (76%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNoneRecipeHandler.java rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/lens/Lenses.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/metalists/TheCrystals.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/metalists/TheDusts.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/metalists/TheFoods.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/metalists/TheJams.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/metalists/TheMiscItems.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/items/metalists/ThePotionRings.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/material/InitArmorMaterials.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/material/InitToolMaterials.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/DamageSources.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/DispenserHandlerEmptyBucket.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/DispenserHandlerFertilize.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/DispenserHandlerFillBucket.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/DungeonLoot.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/EntityColoredParticleFX.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/LaserRelayConnectionHandler.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/WorldData.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/cloud/ISmileyCloudEasterEgg.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/cloud/SmileyCloudEasterEggs.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/special/RenderSpecial.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/special/SpecialRenderInit.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/misc/special/ThreadSpecialFetcher.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/INEIRecipeHandler.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEIActuallyAdditionsConfig.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEIBookletRecipe.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEICoffeeMachineRecipe.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEICompostRecipe.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEICrusherRecipe.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEIFurnaceDoubleRecipe.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEIHairyBallRecipe.java (73%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEIReconstructorRecipe.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEIScreenEvents.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/nei/NEITreasureChestRecipe.java (72%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/PacketBookletStandButton.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/PacketHandler.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/PacketParticle.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/VanillaPacketSyncer.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/gui/IButtonReactor.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/gui/INumberReactor.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/gui/IStringReactor.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/gui/PacketGuiButton.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/gui/PacketGuiNumber.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/network/gui/PacketGuiString.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/ore/InitOreDict.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/proxy/ClientProxy.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/proxy/IProxy.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/proxy/ServerProxy.java (90%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/recipe/FuelHandler.java (85%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/IEnergySaver.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/IFluidSaver.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/IRedstoneToggle.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityAtomicReconstructor.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityBase.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityBookletStand.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityBreaker.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityCanolaPress.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityCoalGenerator.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityCoffeeMachine.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityCompost.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityDirectionalBreaker.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityDropper.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityEnergizer.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityEnervator.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFeeder.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFermentingBarrel.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFireworkBox.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFishingNet.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFluidCollector.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFurnaceDouble.java (99%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityFurnaceSolar.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityGiantChest.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityGreenhouseGlass.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityGrinder.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityHeatCollector.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityInputter.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityInventoryBase.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityItemRepairer.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityLaserRelay.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityLavaFactoryController.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityLeafGenerator.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityMiner.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityOilGenerator.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityPhantomBooster.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityPhantomEnergyface.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityPhantomItemface.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityPhantomLiquiface.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityPhantomPlacer.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityPhantomface.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityRangedCollector.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntitySmileyCloud.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/tile/TileEntityXPSolidifier.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/update/ThreadUpdateChecker.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/update/UpdateChecker.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/update/UpdateCheckerClientNotificationEvent.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/AssetUtil.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/CompatUtil.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/FakePlayerUtil.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/ItemUtil.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/KeyUtil.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/ModUtil.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/StringUtil.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/Util.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/WorldUtil.java (99%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/playerdata/PersistentClientData.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{ => mod}/util/playerdata/PersistentServerData.java (97%) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/recipe/HairyBallHandler.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/recipe/TreasureChestHandler.java diff --git a/src/main/java/de/ellpeck/actuallyadditions/PLANNED.txt b/src/main/java/de/ellpeck/actuallyadditions/PLANNED.txt deleted file mode 100644 index 0f8d6fb3a..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/PLANNED.txt +++ /dev/null @@ -1,151 +0,0 @@ --Quartz Enchanter - -Lets you enchant Tools with Black Quartz - -Doesn't use Levels - -Needs Quartz and Diamond Blocks instead of Bookcases around - --Chestie - -Follows you around - -Has an Inventory, a Crafting Table and a Furnace - --Ender Attractor / Repulsor - -Attracts/Repulses Mobs - -Has an aggressive and a friendly version - -Maybe for Items - --Void Bag - -Sucks up picked up Items - -Has a Filter - -Destroys excess Items (also determined by a Filter) - -Gets emptied into Chest on Right-Click - --Auto-Crafting Item - -Has a Recipe saved - -Crafts Recipe on Shift-Right-Click if all Items are in Inventory - --TNT Arrows - --Teleport Arrows - -Teleport hit Entities randomly - --Thorn Plant - -Grows on the Floor - -Damages Entities walking on it - -Has Thorn Armor which damages the Enemy - --Cobblestone and Stone Signs - --Binoculars - -Allow you to see farther and closer - -With Night Vision Addon - --Sound Irritation Device - -Plays Random or Configured Sounds randomly - --Uncrafting Table - --Decorative Lead - -Can be placed between two Fences for Decoration - --Crafting Table Minecart --Anvil Minecart --Dropper Minecart --Super Speed Track - --File Jukebox - -Plays Sound Files put into your Minecraft Folder - --Pharmacy Plants - -Give you different effects - --Multi-Block Ore Factory - -Fluids and things higher Multiplying Chance (x2, x3..) - -Speed Upgrades etc. - --Advanced Redstone Transmitter - -You can mark an area - -On Activation, all blocks in the area get a Signal - --Thermopile - -Needs a hot and a cold fluid - -Depending on the fluids, it generates more power - --More Effect Rings - -Ring of Thorns: Hurts Attackers when they hit you with a Projectile - -Ring of Water Walking - -Ring of Aquadive: Fast underwater movement - -Ring of Unarmoring: Attacker lose parts of their Armor - --Food Cannon - -Shoots Food Items - -Damage varies with Food - --Furniture - -Can be put into a Crafting Table with a Banner to give it a pattern (1.8!) - -Parts of the furniture can have different types (eg. Wood, Stone etc.) -> Via Crafting or Tool? - --Tinker's Concrete - -Customizable with Items in Concrete Mixer - -(eg. Redstone->Speed Glowstone->Light etc.) - --Alarm - -Gets triggered when Mobs are in the Area - -Configurable Range - -Configurable Mobs - --Industrial Fertilizer - -Grows the whole Plant with one Click - --Dog Bones - -Breed Dogs faster - -Makes them have Babies too - --Testificate Bucks - -Village House that has a Coffee Machine - -Villager who sells Coffee and Cookies - --Inventory Emitter - -Emits a Redstone Signal dependant on the Amount of a specified Item in it - -Items are configurable in the GUI - --Enderman Teleport Stopper - --Placable Buckets - -Buckets can be placed as Bucket Blocks - --Milking Machine - --Shearing Machine - --Sunken City Biome - -Normal Houses, but destroyed - -With Loot Chests - --Weeping Angel-like Statues - -Only move when you don't look - -Teleport you away - --ME Phantomface - --Redstone Phantomface - --Player Phantomface - -Boosters make it work across dimensions - --Crafting Table for Overrides - -When multiple Items have the same crafting recipe, you can switch through and pick what you want - --Crafting Crate - -Storage Crate with Crafting Table inside - --Crafting Viewer - -Crafting Table that shows you every recipe you can craft with all of the Items in your Inventory - --Laser Transport System - -Lasers that shoot between different transmitters - -Transmitters can have prisms etc. to change direction, split up or decide if items, fluids or energy should be moved and how much and how fast - --Tool Table - -Put in any tool and special items - -Make the tool more awesome (Lumberaxe, Battleaxe, Silk Pick, Fortune Pick etc.) - -Every item in the table results in a special feature (e.g. Black Quartz -> Silk, Emeralds -> Fortune etc.) - -> Make drill more endgame, make this midgame stuff \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java new file mode 100644 index 000000000..8aedc3205 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -0,0 +1,152 @@ +/* + * This file ("ActuallyAdditionsAPI.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api; + +import de.ellpeck.actuallyadditions.api.lens.Lens; +import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; +import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.List; + +public class ActuallyAdditionsAPI{ + + public static List crusherRecipes = new ArrayList(); + public static List ballOfFurReturnItems = new ArrayList(); + public static List treasureChestLoot = new ArrayList(); + public static List reconstructorLenses = new ArrayList(); + public static List reconstructorLensNoneRecipes = new ArrayList(); + public static List coffeeMachineIngredients = new ArrayList(); + + /** + * Adds a Recipe to the Crusher Recipe Registry + * The second output will be nothing + * + * @param input The input's OreDictionary name + * @param outputOne The first output's OreDictionary name + * @param outputOneAmount The amount of the first output + */ + public static void addCrusherRecipe(String input, String outputOne, int outputOneAmount){ + addCrusherRecipe(input, outputOne, outputOneAmount, "", 0, 0); + } + + /** + * Adds a Recipe to the Crusher Recipe Registry + * + * @param input The input's OreDictionary name + * @param outputOne The first output's OreDictionary name + * @param outputOneAmount The amount of the first output + * @param outputTwo The second output's OreDictionary name + * @param outputTwoAmount The amount of the second output + * @param outputTwoChance The chance of the second output (0 won't occur at all, 100 will all the time) + */ + public static void addCrusherRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){ + if(!OreDictionary.getOres(input, false).isEmpty() && !OreDictionary.getOres(outputOne, false).isEmpty() && (outputTwo == null || outputTwo.isEmpty() || !OreDictionary.getOres(outputTwo, false).isEmpty())){ + crusherRecipes.add(new CrusherRecipe(input, outputOne, outputOneAmount, outputTwo, outputTwoAmount, outputTwoChance)); + } + } + + /** + * Adds a Recipe to the Crusher Recipe Registry + * The second output will be nothing + * + * @param input The input as an ItemStack + * @param outputOne The first output as an ItemStack + */ + public static void addCrusherRecipe(ItemStack input, ItemStack outputOne){ + addCrusherRecipe(input, outputOne, null, 0); + } + + /** + * Adds a Recipe to the Crusher Recipe Registry + * The second output will be nothing + * + * @param input The input as an ItemStack + * @param outputOne The first output as an ItemStack + * @param outputTwo The second output as an ItemStack + * @param outputTwoChance The chance of the second output (0 won't occur at all, 100 will all the time) + */ + public static void addCrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){ + crusherRecipes.add(new CrusherRecipe(input, outputOne, outputTwo, outputTwoChance)); + } + + /** + * Adds a Recipe to the Crusher Recipe Registry + * The second output will be nothing + * + * @param input The input as an ItemStack + * @param outputOne The first output's OreDictionary name + * @param outputOneAmount The amount of the first output + */ + public static void addCrusherRecipe(ItemStack input, String outputOne, int outputOneAmount){ + if(!OreDictionary.getOres(outputOne, false).isEmpty()){ + crusherRecipes.add(new CrusherRecipe(input, outputOne, outputOneAmount)); + } + } + + /** + * Adds an item to the list of possible items to be returned when right-clicking a Ball Of Fur + * + * @param stack The ItemStack to be returned + * @param chance The chance (this is from WeightedRandom.Item) + */ + public static void addBallOfFurReturnItem(ItemStack stack, int chance){ + ActuallyAdditionsAPI.ballOfFurReturnItems.add(new BallOfFurReturn(stack, chance)); + } + + /** + * Adds an item to the list of possible items to be returned when opening a Treasure Chest + * + * @param stack The ItemStack to be returned, the stacksize is ignored + * @param chance The chance (this is from WeightedRandom.Item) + * @param minAmount The minimum stacksize of the returned stack + * @param maxAmount The maximum stacksize of the returned stack + */ + public static void addTreasureChestLoot(ItemStack stack, int chance, int minAmount, int maxAmount){ + ActuallyAdditionsAPI.treasureChestLoot.add(new TreasureChestLoot(stack, chance, minAmount, maxAmount)); + } + + /** + * Adds a recipe to the Atomic Reconstructor conversion without lens + * StackSizes can only be 1 and greater ones will be ignored + * + * @param input The input as an ItemStack + * @param output The output as an ItemStack + * @param energyUse The amount of RF used per conversion + */ + public static void addReconstructorLensNoneRecipe(ItemStack input, ItemStack output, int energyUse){ + reconstructorLensNoneRecipes.add(new LensNoneRecipe(input, output, energyUse)); + } + + /** + * Adds a recipe to the Atomic Reconstructor conversion without lens + * + * @param input The input's OreDictionary name + * @param output The output's OreDictionary name + * @param energyUse The amount of RF used per conversion + */ + public static void addReconstructorLensNoneRecipe(String input, String output, int energyUse){ + reconstructorLensNoneRecipes.add(new LensNoneRecipe(input, output, energyUse)); + } + + /** + * Adds an ingredient to the Coffee Machine ingredient list + * @param ingredient The ingredient to add + */ + public static void addCoffeeMachineIngredient(CoffeeIngredient ingredient){ + coffeeMachineIngredients.add(ingredient); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/Position.java b/src/main/java/de/ellpeck/actuallyadditions/api/Position.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/util/Position.java rename to src/main/java/de/ellpeck/actuallyadditions/api/Position.java index 792f7e3f0..d497a6664 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/Position.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/Position.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.api; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -17,6 +17,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.World; +/** + * This utility class describes a position in the world + */ public class Position{ private int x; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/IHudDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/api/block/IHudDisplay.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/IHudDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/api/block/IHudDisplay.java index d195a6361..9c98747a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/IHudDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/block/IHudDisplay.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.api.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,6 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.profiler.Profiler; import net.minecraft.util.MovingObjectPosition; +/** + * Extending this will cause displayHud() to be called when hovering over it in-world + */ public interface IHudDisplay{ @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/IAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/IAtomicReconstructor.java new file mode 100644 index 000000000..6bdd41086 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/IAtomicReconstructor.java @@ -0,0 +1,50 @@ +/* + * This file ("IAtomicReconstructor.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.lens; + +import net.minecraft.world.World; + +/** + * This is a helper interface for Lens' invoke() method. + * This is not supposed to be implemented. + */ +public interface IAtomicReconstructor{ + + /** + * Returns the x coord of the reconstructor + */ + int getX(); + + /** + * Returns the y coord of the reconstructor + */ + int getY(); + + /** + * Returns the z coord of the reconstructor + */ + int getZ(); + + /** + * Returns the world of the reconstructor + */ + World getWorldObj(); + + /** + * Extracts a specified amount of energy from the Reconstructor's RF storage + */ + void extractEnergy(int amount); + + /** + * Gets the amount of energy the Reconstructor has stored in its RF storage + */ + int getEnergy(); +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java new file mode 100644 index 000000000..e1faa032f --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java @@ -0,0 +1,22 @@ +/* + * This file ("ILensItem.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.lens; + +/** + * This is the base class for a Reconstructor Lens Item + */ +public interface ILensItem{ + + /** + * Returns the lens type that belongs to this lens item + */ + Lens getLens(); +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java new file mode 100644 index 000000000..2b7a62e49 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java @@ -0,0 +1,60 @@ +/* + * This file ("Lens.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.lens; + +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.Position; +import net.minecraft.item.Item; + +/** + * This is the base class for a Reconstructor Lens Type (NOT THE ITEM!) + * You need to call register() to register the type + */ +public abstract class Lens{ + + /** + * The item that belongs to this lens type + */ + protected Item lensItem; + + /** + * Invokes the lens type's behavior on a block + * @param hitBlock The block that was hit + * @param tile The tile the lens was invoked from + * @return If the Reconstructor should stop continuing (return false if you want it to go through blocks) + */ + public abstract boolean invoke(Position hitBlock, IAtomicReconstructor tile); + + /** + * Returns the color in an array of 3 float values that are r, g, b + */ + public abstract float[] getColor(); + + /** + * Gets the maximum distance the beam goes with this lense + */ + public abstract int getDistance(); + + /** + * Registers the lense type + */ + public Lens register(){ + ActuallyAdditionsAPI.reconstructorLenses.add(this); + return this; + } + + /** + * Sets the item corresponding to the lense + */ + public void setLensItem(Item item){ + this.lensItem = item; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java b/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java new file mode 100644 index 000000000..18798c53e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java @@ -0,0 +1,13 @@ +/* + * This file ("package-info.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ +@API(owner = "Ellpeck", apiVersion = "1", provides = "ActuallyAdditionsAPI") +package de.ellpeck.actuallyadditions.api; + +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java new file mode 100644 index 000000000..845a3e17b --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java @@ -0,0 +1,25 @@ +/* + * This file ("BallOfFurReturn.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; + +public class BallOfFurReturn extends WeightedRandom.Item{ + + public ItemStack returnItem; + + public BallOfFurReturn(ItemStack returnItem, int chance){ + super(chance); + this.returnItem = returnItem; + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java new file mode 100644 index 000000000..7a6c04d8b --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java @@ -0,0 +1,125 @@ +/* + * This file ("CrusherRecipe.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class CrusherRecipe{ + + public int outputTwoChance; + public String input; + public String outputOne; + public int outputOneAmount; + public String outputTwo; + public int outputTwoAmount; + private ItemStack inputStack; + private ItemStack outputOneStack; + private ItemStack outputTwoStack; + + public CrusherRecipe(ItemStack input, String outputOne, int outputOneAmount){ + this.inputStack = input; + this.outputOne = outputOne; + this.outputOneAmount = outputOneAmount; + } + + public CrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){ + this.inputStack = input; + this.outputOneStack = outputOne; + this.outputTwoStack = outputTwo; + this.outputTwoChance = outputTwoChance; + } + + public CrusherRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){ + this.input = input; + this.outputOne = outputOne; + this.outputOneAmount = outputOneAmount; + this.outputTwo = outputTwo; + this.outputTwoAmount = outputTwoAmount; + this.outputTwoChance = outputTwoChance; + } + + public List getRecipeOutputOnes(){ + if(this.outputOneStack != null){ + return Collections.singletonList(this.outputOneStack.copy()); + } + + if(this.outputOne == null || this.outputOne.isEmpty()){ + return null; + } + + List stacks = OreDictionary.getOres(this.outputOne, false); + if(stacks != null && !stacks.isEmpty()){ + List stacksCopy = new ArrayList(); + for(ItemStack stack : stacks){ + if(stack != null){ + ItemStack stackCopy = stack.copy(); + stackCopy.stackSize = this.outputOneAmount; + stacksCopy.add(stackCopy); + } + } + return stacksCopy; + } + return null; + } + + public List getRecipeOutputTwos(){ + if(this.outputTwoStack != null){ + return Collections.singletonList(this.outputTwoStack.copy()); + } + + if(this.outputTwo == null || this.outputTwo.isEmpty()){ + return null; + } + + List stacks = OreDictionary.getOres(this.outputTwo, false); + if(stacks != null && !stacks.isEmpty()){ + List stacksCopy = new ArrayList(); + for(ItemStack stack : stacks){ + if(stack != null){ + ItemStack stackCopy = stack.copy(); + stackCopy.stackSize = this.outputTwoAmount; + stacksCopy.add(stackCopy); + } + } + return stacksCopy; + } + return null; + } + + public List getRecipeInputs(){ + if(this.inputStack != null){ + return Collections.singletonList(this.inputStack.copy()); + } + + if(this.input == null || this.input.isEmpty()){ + return null; + } + + List stacks = OreDictionary.getOres(this.input, false); + if(stacks != null && !stacks.isEmpty()){ + List stacksCopy = new ArrayList(); + for(ItemStack stack : stacks){ + if(stack != null){ + ItemStack stackCopy = stack.copy(); + stackCopy.stackSize = 1; + stacksCopy.add(stackCopy); + } + } + return stacksCopy; + } + return null; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensNoneRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensNoneRecipe.java new file mode 100644 index 000000000..45bb5e923 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensNoneRecipe.java @@ -0,0 +1,87 @@ +/* + * This file ("LensNoneRecipe.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class LensNoneRecipe{ + + public int energyUse; + private String input; + private String output; + private ItemStack inputStack; + private ItemStack outputStack; + + public LensNoneRecipe(ItemStack input, ItemStack output, int energyUse){ + this.inputStack = input; + this.outputStack = output; + this.energyUse = energyUse; + } + + public LensNoneRecipe(String input, String output, int energyUse){ + this.input = input; + this.output = output; + this.energyUse = energyUse; + } + + public List getOutputs(){ + if(this.outputStack != null){ + return Collections.singletonList(this.outputStack.copy()); + } + + if(this.output == null || this.output.isEmpty()){ + return null; + } + + List stacks = OreDictionary.getOres(this.output, false); + if(stacks != null && !stacks.isEmpty()){ + List stacksCopy = new ArrayList(); + for(ItemStack stack : stacks){ + if(stack != null){ + ItemStack stackCopy = stack.copy(); + stackCopy.stackSize = 1; + stacksCopy.add(stackCopy); + } + } + return stacksCopy; + } + return null; + } + + public List getInputs(){ + if(this.inputStack != null){ + return Collections.singletonList(this.inputStack.copy()); + } + + if(this.input == null || this.input.isEmpty()){ + return null; + } + + List stacks = OreDictionary.getOres(this.input, false); + if(stacks != null && !stacks.isEmpty()){ + List stacksCopy = new ArrayList(); + for(ItemStack stack : stacks){ + if(stack != null){ + ItemStack stackCopy = stack.copy(); + stackCopy.stackSize = 1; + stacksCopy.add(stackCopy); + } + } + return stacksCopy; + } + return null; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java new file mode 100644 index 000000000..7c02f8855 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java @@ -0,0 +1,29 @@ +/* + * This file ("TreasureChestLoot.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; + +public class TreasureChestLoot extends WeightedRandom.Item{ + + public ItemStack returnItem; + public int minAmount; + public int maxAmount; + + public TreasureChestLoot(ItemStack returnItem, int chance, int minAmount, int maxAmount){ + super(chance); + this.returnItem = returnItem; + this.minAmount = minAmount; + this.maxAmount = maxAmount; + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeBrewing.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeBrewing.java new file mode 100644 index 000000000..b7ec3e8b6 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeBrewing.java @@ -0,0 +1,107 @@ +/* + * This file ("CoffeeBrewing.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.recipe.coffee; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; + +import java.util.ArrayList; + +/** + * This is a util class for adding Ingredients to ItemStacks + * Use when making a custom Coffee Ingredient + */ +public class CoffeeBrewing{ + + public static boolean addEffectToStack(ItemStack stack, CoffeeIngredient ingredient){ + boolean worked = false; + if(ingredient != null){ + PotionEffect[] effects = ingredient.getEffects(); + if(effects != null && effects.length > 0){ + for(PotionEffect effect : effects){ + PotionEffect effectHas = getSameEffectFromStack(stack, effect); + if(effectHas != null){ + if(effectHas.getAmplifier() < ingredient.maxAmplifier-1){ + addEffectProperties(stack, effect, false, true); + worked = true; + } + } + else{ + addEffectToStack(stack, effect); + worked = true; + } + } + } + } + return worked; + } + + public static PotionEffect getSameEffectFromStack(ItemStack stack, PotionEffect effect){ + PotionEffect[] effectsStack = getEffectsFromStack(stack); + if(effectsStack != null && effectsStack.length > 0){ + for(PotionEffect effectStack : effectsStack){ + if(effect.getPotionID() == effectStack.getPotionID()){ + return effectStack; + } + } + } + return null; + } + + public static void addEffectProperties(ItemStack stack, PotionEffect effect, boolean addDur, boolean addAmp){ + PotionEffect[] effects = getEffectsFromStack(stack); + stack.setTagCompound(new NBTTagCompound()); + for(int i = 0; i < effects.length; i++){ + if(effects[i].getPotionID() == effect.getPotionID()){ + effects[i] = new PotionEffect(effects[i].getPotionID(), effects[i].getDuration()+(addDur ? effect.getDuration() : 0), effects[i].getAmplifier()+(addAmp ? (effect.getAmplifier() > 0 ? effect.getAmplifier() : 1) : 0)); + } + addEffectToStack(stack, effects[i]); + } + } + + public static void addEffectToStack(ItemStack stack, PotionEffect effect){ + NBTTagCompound tag = stack.getTagCompound(); + if(tag == null){ + tag = new NBTTagCompound(); + } + + int prevCounter = tag.getInteger("Counter"); + NBTTagCompound compound = new NBTTagCompound(); + compound.setInteger("ID", effect.getPotionID()); + compound.setInteger("Duration", effect.getDuration()); + compound.setInteger("Amplifier", effect.getAmplifier()); + + int counter = prevCounter+1; + tag.setTag(counter+"", compound); + tag.setInteger("Counter", counter); + + stack.setTagCompound(tag); + } + + public static PotionEffect[] getEffectsFromStack(ItemStack stack){ + ArrayList effects = new ArrayList(); + NBTTagCompound tag = stack.getTagCompound(); + if(tag != null){ + int counter = tag.getInteger("Counter"); + while(counter > 0){ + NBTTagCompound compound = (NBTTagCompound)tag.getTag(counter+""); + PotionEffect effect = new PotionEffect(compound.getInteger("ID"), compound.getInteger("Duration"), compound.getByte("Amplifier")); + if(effect.getPotionID() > 0){ + effects.add(effect); + } + counter--; + } + } + return effects.size() > 0 ? effects.toArray(new PotionEffect[effects.size()]) : null; + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeIngredient.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeIngredient.java new file mode 100644 index 000000000..53f67a3b4 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeIngredient.java @@ -0,0 +1,39 @@ +/* + * This file ("CoffeeIngredient.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.api.recipe.coffee; + +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; + +public class CoffeeIngredient{ + + public final ItemStack ingredient; + public final int maxAmplifier; + protected PotionEffect[] effects; + + public CoffeeIngredient(ItemStack ingredient, PotionEffect[] effects, int maxAmplifier){ + this.ingredient = ingredient.copy(); + this.effects = effects; + this.maxAmplifier = maxAmplifier; + } + + public PotionEffect[] getEffects(){ + return this.effects; + } + + public boolean effect(ItemStack stack){ + return CoffeeBrewing.addEffectToStack(stack, this); + } + + public String getExtraText(){ + return null; + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/IEnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/api/tile/IEnergyDisplay.java similarity index 77% rename from src/main/java/de/ellpeck/actuallyadditions/tile/IEnergyDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/api/tile/IEnergyDisplay.java index ed8b51d14..dc88ca65f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/IEnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/tile/IEnergyDisplay.java @@ -8,11 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.api.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +/** + * Extending this will cause a block to show "getEnergy()/maxEnergy() RF" when hovering over it in-world + */ public interface IEnergyDisplay{ @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/IPhantomTile.java b/src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java similarity index 78% rename from src/main/java/de/ellpeck/actuallyadditions/tile/IPhantomTile.java rename to src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java index 81279656c..725738c5e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/IPhantomTile.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java @@ -8,10 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.api.tile; -import de.ellpeck.actuallyadditions.util.Position; +import de.ellpeck.actuallyadditions.api.Position; +/** + * Extending this will cause a TileEntity to be able to be connected via a Phantom Connector + */ public interface IPhantomTile{ /** @@ -29,6 +32,9 @@ public interface IPhantomTile{ */ Position getBoundPosition(); + /** + * Sets the bound position + */ void setBoundPosition(Position pos); /** diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/crafting/CrusherCrafting.java deleted file mode 100644 index 96aa5c102..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/CrusherCrafting.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * This file ("CrusherCrafting.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.crafting; - -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; - -public class CrusherCrafting{ - - public static CrusherRecipeRegistry.CrusherRecipe recipeIronHorseArmor; - public static CrusherRecipeRegistry.CrusherRecipe recipeGoldHorseArmor; - public static CrusherRecipeRegistry.CrusherRecipe recipeDiamondHorseArmor; - public static ArrayList miscRecipes = new ArrayList(); - - public static void init(){ - ModUtil.LOGGER.info("Initializing Crusher Recipes..."); - - CrusherRecipeRegistry.addRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Items.reeds), new ItemStack(Items.sugar, 3)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.yellow_flower), new ItemStack(Items.dye, 3, 11)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 3, 1)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 3, 12)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Items.dye, 3, 13)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 3), new ItemStack(Items.dye, 3, 7)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 4), new ItemStack(Items.dye, 3, 1)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 5), new ItemStack(Items.dye, 3, 14)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 6), new ItemStack(Items.dye, 3, 7)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 7), new ItemStack(Items.dye, 3, 9)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 8), new ItemStack(Items.dye, 3, 7)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 0), new ItemStack(Items.dye, 4, 11)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Items.dye, 4, 13)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Items.dye, 4, 1)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Items.dye, 4, 9)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - - CrusherRecipeRegistry.addRecipe("oreRedstone", "dustRedstone", 10); - CrusherRecipeRegistry.addRecipe("oreLapis", "gemLapis", 12); - CrusherRecipeRegistry.addRecipe("coal", "dustCoal", 1); - CrusherRecipeRegistry.addRecipe("oreCoal", "coal", 3); - CrusherRecipeRegistry.addRecipe("blockCoal", "coal", 9); - CrusherRecipeRegistry.addRecipe("oreQuartz", "gemQuartz", 3); - CrusherRecipeRegistry.addRecipe("cobblestone", "sand", 1); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint), new ItemStack(Items.flint), 50); - CrusherRecipeRegistry.addRecipe("stone", "cobblestone", 1); - - CrusherRecipeRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 2)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - - CrusherRecipeRegistry.addRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15); - CrusherRecipeRegistry.addRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20); - - if(ConfigCrafting.HORSE_ARMORS.isEnabled()){ - CrusherRecipeRegistry.addRecipe(new ItemStack(Items.iron_horse_armor), "dustIron", 8); - recipeIronHorseArmor = Util.GetRecipes.lastCrusherRecipe(); - - CrusherRecipeRegistry.addRecipe(new ItemStack(Items.golden_horse_armor), "dustGold", 8); - recipeGoldHorseArmor = Util.GetRecipes.lastCrusherRecipe(); - - CrusherRecipeRegistry.addRecipe(new ItemStack(Items.diamond_horse_armor), "dustDiamond", 8); - recipeDiamondHorseArmor = Util.GetRecipes.lastCrusherRecipe(); - } - - CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("oreNether", 6)); - CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("orePoor", 4, "nugget")); - CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("denseore", 8)); - CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("gem", 1)); - CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("ingot", 1)); - CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("ore", 2)); - - CrusherRecipeRegistry.registerFinally(); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffee.java deleted file mode 100644 index 9a652aa99..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffee.java +++ /dev/null @@ -1,289 +0,0 @@ -/* - * This file ("ItemCoffee.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.items; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.EnumAction; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.util.StringUtils; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class ItemCoffee extends ItemFoodBase{ - - public static ArrayList ingredients = new ArrayList(); - - public ItemCoffee(String name){ - super(8, 5.0F, false, name); - this.setMaxDamage(3); - this.setAlwaysEdible(); - this.setMaxStackSize(1); - this.setNoRepair(); - } - - public static void initIngredients(){ - registerIngredient(new MilkIngredient(new ItemStack(Items.milk_bucket))); - //Pam's Soy Milk (For Jemx because he's lactose intolerant. YER HAPPY NAO!?) - if(Loader.isModLoaded("harvestcraft")){ - Item item = ItemUtil.getItemFromName("harvestcraft:soymilkItem"); - if(item != null){ - registerIngredient(new MilkIngredient(new ItemStack(item))); - } - } - - registerIngredient(new Ingredient(new ItemStack(Items.sugar), new PotionEffect[]{new PotionEffect(Potion.moveSpeed.getId(), 30, 0)}, 4)); - registerIngredient(new Ingredient(new ItemStack(Items.magma_cream), new PotionEffect[]{new PotionEffect(Potion.fireResistance.getId(), 20, 0)}, 2)); - registerIngredient(new Ingredient(new ItemStack(Items.fish, 1, 3), new PotionEffect[]{new PotionEffect(Potion.waterBreathing.getId(), 10, 0)}, 2)); - registerIngredient(new Ingredient(new ItemStack(Items.golden_carrot), new PotionEffect[]{new PotionEffect(Potion.nightVision.getId(), 30, 0)}, 2)); - registerIngredient(new Ingredient(new ItemStack(Items.ghast_tear), new PotionEffect[]{new PotionEffect(Potion.regeneration.getId(), 5, 0)}, 3)); - registerIngredient(new Ingredient(new ItemStack(Items.blaze_powder), new PotionEffect[]{new PotionEffect(Potion.damageBoost.getId(), 15, 0)}, 4)); - registerIngredient(new Ingredient(new ItemStack(Items.fermented_spider_eye), new PotionEffect[]{new PotionEffect(Potion.invisibility.getId(), 25, 0)}, 2)); - } - - public static void registerIngredient(Ingredient ingredient){ - ingredients.add(ingredient); - } - - public static Ingredient getIngredientFromStack(ItemStack stack){ - for(Ingredient ingredient : ingredients){ - if(ingredient.ingredient.copy().isItemEqual(stack)){ - return ingredient; - } - } - return null; - } - - public static boolean addEffectToStack(ItemStack stack, Ingredient ingredient){ - boolean worked = false; - if(ingredient != null){ - PotionEffect[] effects = ingredient.getEffects(); - if(effects != null && effects.length > 0){ - for(PotionEffect effect : effects){ - PotionEffect effectHas = getSameEffectFromStack(stack, effect); - if(effectHas != null){ - if(effectHas.getAmplifier() < ingredient.maxAmplifier-1){ - addEffectProperties(stack, effect, false, true); - worked = true; - } - } - else{ - addEffectToStack(stack, effect); - worked = true; - } - } - } - } - return worked; - } - - public static PotionEffect getSameEffectFromStack(ItemStack stack, PotionEffect effect){ - PotionEffect[] effectsStack = getEffectsFromStack(stack); - if(effectsStack != null && effectsStack.length > 0){ - for(PotionEffect effectStack : effectsStack){ - if(effect.getPotionID() == effectStack.getPotionID()){ - return effectStack; - } - } - } - return null; - } - - public static void addEffectProperties(ItemStack stack, PotionEffect effect, boolean addDur, boolean addAmp){ - PotionEffect[] effects = getEffectsFromStack(stack); - stack.setTagCompound(new NBTTagCompound()); - for(int i = 0; i < effects.length; i++){ - if(effects[i].getPotionID() == effect.getPotionID()){ - effects[i] = new PotionEffect(effects[i].getPotionID(), effects[i].getDuration()+(addDur ? effect.getDuration() : 0), effects[i].getAmplifier()+(addAmp ? (effect.getAmplifier() > 0 ? effect.getAmplifier() : 1) : 0)); - } - addEffectToStack(stack, effects[i]); - } - } - - public static void addEffectToStack(ItemStack stack, PotionEffect effect){ - NBTTagCompound tag = stack.getTagCompound(); - if(tag == null){ - tag = new NBTTagCompound(); - } - - int prevCounter = tag.getInteger("Counter"); - NBTTagCompound compound = new NBTTagCompound(); - compound.setInteger("ID", effect.getPotionID()); - compound.setInteger("Duration", effect.getDuration()); - compound.setInteger("Amplifier", effect.getAmplifier()); - - int counter = prevCounter+1; - tag.setTag(counter+"", compound); - tag.setInteger("Counter", counter); - - stack.setTagCompound(tag); - } - - public static PotionEffect[] getEffectsFromStack(ItemStack stack){ - ArrayList effects = new ArrayList(); - NBTTagCompound tag = stack.getTagCompound(); - if(tag != null){ - int counter = tag.getInteger("Counter"); - while(counter > 0){ - NBTTagCompound compound = (NBTTagCompound)tag.getTag(counter+""); - PotionEffect effect = new PotionEffect(compound.getInteger("ID"), compound.getInteger("Duration"), compound.getByte("Amplifier")); - if(effect.getPotionID() > 0){ - effects.add(effect); - } - counter--; - } - } - return effects.size() > 0 ? effects.toArray(new PotionEffect[effects.size()]) : null; - } - - @Override - public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ - ItemStack theStack = stack.copy(); - super.onEaten(stack, world, player); - applyPotionEffectsFromStack(stack, player); - theStack.setItemDamage(theStack.getItemDamage()+1); - if(theStack.getMaxDamage()-theStack.getItemDamage() < 0){ - return new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()); - } - else{ - return theStack; - } - } - - public static void applyPotionEffectsFromStack(ItemStack stack, EntityPlayer player){ - PotionEffect[] effects = getEffectsFromStack(stack); - if(effects != null && effects.length > 0){ - for(PotionEffect effect : effects){ - player.addPotionEffect(new PotionEffect(effect.getPotionID(), effect.getDuration()*20, effect.getAmplifier())); - } - } - } - - @Override - public EnumAction getItemUseAction(ItemStack stack){ - return EnumAction.drink; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1){ - return this.itemIcon; - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public boolean getShareTag(){ - return true; - } - - @SuppressWarnings("unchecked") - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){ - PotionEffect[] effects = getEffectsFromStack(stack); - if(effects != null){ - for(PotionEffect effect : effects){ - list.add(StringUtil.localize(effect.getEffectName())+" "+(effect.getAmplifier()+1)+", "+StringUtils.ticksToElapsedTime(effect.getDuration()*20)); - } - } - else{ - list.add("No Effects"); - } - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName()); - } - - public static class Ingredient{ - - public final ItemStack ingredient; - public final int maxAmplifier; - protected PotionEffect[] effects; - - public Ingredient(ItemStack ingredient, PotionEffect[] effects, int maxAmplifier){ - this.ingredient = ingredient.copy(); - this.effects = effects; - this.maxAmplifier = maxAmplifier; - } - - public PotionEffect[] getEffects(){ - return this.effects; - } - - public boolean effect(ItemStack stack){ - return ItemCoffee.addEffectToStack(stack, this); - } - - public String getExtraText(){ - return null; - } - } - - public static class MilkIngredient extends Ingredient{ - - public MilkIngredient(ItemStack ingredient){ - super(ingredient, null, 0); - } - - @Override - public boolean effect(ItemStack stack){ - PotionEffect[] effects = getEffectsFromStack(stack); - ArrayList effectsNew = new ArrayList(); - if(effects != null && effects.length > 0){ - for(PotionEffect effect : effects){ - if(effect.getAmplifier() > 0){ - effectsNew.add(new PotionEffect(effect.getPotionID(), effect.getDuration()+120, effect.getAmplifier()-1)); - } - } - stack.setTagCompound(new NBTTagCompound()); - if(effectsNew.size() > 0){ - this.effects = effectsNew.toArray(new PotionEffect[effectsNew.size()]); - ItemCoffee.addEffectToStack(stack, this); - } - } - this.effects = null; - return true; - } - - @Override - public String getExtraText(){ - return StringUtil.localize("container.nei."+ModUtil.MOD_ID_LOWER+".coffee.extra.milk"); - } - } -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/Lens.java b/src/main/java/de/ellpeck/actuallyadditions/items/lens/Lens.java deleted file mode 100644 index 37f01c78b..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/Lens.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file ("Lens.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.items.lens; - -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.Position; -import net.minecraft.item.Item; - -public abstract class Lens{ - - protected Item lensItem; - - public abstract boolean invoke(Position hitBlock, TileEntityAtomicReconstructor tile); - - public abstract float[] getColor(); - - public abstract int getDistance(); - - public Lens register(){ - Lenses.allLenses.add(this); - return this; - } - - public void setLensItem(Item item){ - this.lensItem = item; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java deleted file mode 100644 index 2aecd4dbc..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * This file ("LensNoneRecipeHandler.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.items.lens; - -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.Util; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class LensNoneRecipeHandler{ - - public static ArrayList recipes = new ArrayList(); - - public static ArrayList mainPageRecipes = new ArrayList(); - public static Recipe recipeColorLens; - public static Recipe recipeSoulSand; - public static Recipe recipeGreenWall; - public static Recipe recipeWhiteWall; - public static Recipe recipeExplosionLens; - public static Recipe recipeDamageLens; - public static Recipe recipeLeather; - - public static void init(){ - //Crystal Blocks - addRecipe(new ItemStack(Blocks.redstone_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.REDSTONE.ordinal()), 400); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Blocks.lapis_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 400); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Blocks.diamond_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 600); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Blocks.emerald_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.EMERALD.ordinal()), 1000); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Blocks.coal_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), 600); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Blocks.iron_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 800); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - - //Crystal Items - addRecipe(new ItemStack(Items.redstone), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 40); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Items.dye, 1, 4), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 40); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Items.diamond), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 60); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Items.emerald), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 100); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 60); - mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); - addRecipe(new ItemStack(Items.iron_ingot), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 80); - - //Lenses - addRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new ItemStack(InitItems.itemColorLens), 5000); - recipeColorLens = Util.GetRecipes.lastReconstructorRecipe(); - - if(ConfigCrafting.RECONSTRUCTOR_EXPLOSION_LENS.isEnabled()){ - addRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemExplosionLens), 5000); - recipeExplosionLens = Util.GetRecipes.lastReconstructorRecipe(); - addRecipe(new ItemStack(InitItems.itemExplosionLens), new ItemStack(InitItems.itemDamageLens), 5000); - } - else{ - addRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemDamageLens), 5000); - } - recipeDamageLens = Util.GetRecipes.lastReconstructorRecipe(); - - addRecipe(new ItemStack(InitItems.itemDamageLens), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), 5000); - - //Misc - if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){ - addRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.soul_sand), 20000); - recipeSoulSand = Util.GetRecipes.lastReconstructorRecipe(); - addRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(Items.leather), 8000); - recipeLeather = Util.GetRecipes.lastReconstructorRecipe(); - } - - addRecipe(new ItemStack(Blocks.quartz_block), new ItemStack(InitBlocks.blockTestifiBucksWhiteWall), 10); - recipeWhiteWall = Util.GetRecipes.lastReconstructorRecipe(); - addRecipe(new ItemStack(Blocks.quartz_block, 1, 1), new ItemStack(InitBlocks.blockTestifiBucksGreenWall), 10); - recipeGreenWall = Util.GetRecipes.lastReconstructorRecipe(); - } - - public static void addRecipe(ItemStack input, ItemStack output, int energyUse){ - recipes.add(new Recipe(input, output, energyUse)); - } - - public static void addRecipe(String input, String output, int energyUse){ - recipes.add(new Recipe(input, output, energyUse)); - } - - public static ArrayList getRecipesFor(ItemStack input){ - ArrayList possibleRecipes = new ArrayList(); - for(Recipe recipe : recipes){ - if(ItemUtil.contains(recipe.getInputs(), input, true)){ - possibleRecipes.add(recipe); - } - } - return possibleRecipes; - } - - public static class Recipe{ - - public int energyUse; - private String input; - private String output; - private ItemStack inputStack; - private ItemStack outputStack; - - public Recipe(ItemStack input, ItemStack output, int energyUse){ - this.inputStack = input; - this.outputStack = output; - this.energyUse = energyUse; - } - - public Recipe(String input, String output, int energyUse){ - this.input = input; - this.output = output; - this.energyUse = energyUse; - } - - public List getOutputs(){ - if(this.outputStack != null){ - return Collections.singletonList(this.outputStack.copy()); - } - - if(this.output == null || this.output.isEmpty()){ - return null; - } - - List stacks = OreDictionary.getOres(this.output, false); - if(stacks != null && !stacks.isEmpty()){ - List stacksCopy = new ArrayList(); - for(ItemStack stack : stacks){ - if(stack != null){ - ItemStack stackCopy = stack.copy(); - stackCopy.stackSize = 1; - stacksCopy.add(stackCopy); - } - } - return stacksCopy; - } - return null; - } - - public List getInputs(){ - if(this.inputStack != null){ - return Collections.singletonList(this.inputStack.copy()); - } - - if(this.input == null || this.input.isEmpty()){ - return null; - } - - List stacks = OreDictionary.getOres(this.input, false); - if(stacks != null && !stacks.isEmpty()){ - List stacksCopy = new ArrayList(); - for(ItemStack stack : stacks){ - if(stack != null){ - ItemStack stackCopy = stack.copy(); - stackCopy.stackSize = 1; - stacksCopy.add(stackCopy); - } - } - return stacksCopy; - } - return null; - } - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java similarity index 67% rename from src/main/java/de/ellpeck/actuallyadditions/ActuallyAdditions.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 8754aadc8..17588f751 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -8,55 +8,55 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions; +package de.ellpeck.actuallyadditions.mod; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; -import de.ellpeck.actuallyadditions.achievement.InitAchievements; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.crafting.CrusherCrafting; -import de.ellpeck.actuallyadditions.crafting.InitCrafting; -import de.ellpeck.actuallyadditions.crafting.ItemCrafting; -import de.ellpeck.actuallyadditions.event.InitEvents; -import de.ellpeck.actuallyadditions.gen.InitVillager; -import de.ellpeck.actuallyadditions.gen.OreGen; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.InitForeignPaxels; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemCoffee; -import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler; -import de.ellpeck.actuallyadditions.material.InitArmorMaterials; -import de.ellpeck.actuallyadditions.material.InitToolMaterials; -import de.ellpeck.actuallyadditions.misc.*; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.ore.InitOreDict; -import de.ellpeck.actuallyadditions.proxy.IProxy; -import de.ellpeck.actuallyadditions.recipe.FuelHandler; -import de.ellpeck.actuallyadditions.recipe.HairyBallHandler; -import de.ellpeck.actuallyadditions.recipe.TreasureChestHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.update.UpdateChecker; -import de.ellpeck.actuallyadditions.util.FakePlayerUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting; +import de.ellpeck.actuallyadditions.mod.event.InitEvents; +import de.ellpeck.actuallyadditions.mod.gen.InitVillager; +import de.ellpeck.actuallyadditions.mod.gen.OreGen; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; +import de.ellpeck.actuallyadditions.mod.items.lens.LensNoneRecipeHandler; +import de.ellpeck.actuallyadditions.mod.material.InitArmorMaterials; +import de.ellpeck.actuallyadditions.mod.material.InitToolMaterials; +import de.ellpeck.actuallyadditions.mod.misc.*; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.ore.InitOreDict; +import de.ellpeck.actuallyadditions.mod.proxy.IProxy; +import de.ellpeck.actuallyadditions.mod.recipe.FuelHandler; +import de.ellpeck.actuallyadditions.mod.recipe.HairyBallHandler; +import de.ellpeck.actuallyadditions.mod.recipe.TreasureChestHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.update.UpdateChecker; +import de.ellpeck.actuallyadditions.mod.util.FakePlayerUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Items; import net.minecraft.server.MinecraftServer; import java.util.Locale; // So that BuildCraft Oil always gets used -@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", guiFactory = "de.ellpeck.actuallyadditions.config.GuiFactory") +@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", guiFactory = "GuiFactory") public class ActuallyAdditions{ @Instance(ModUtil.MOD_ID) public static ActuallyAdditions instance; - @SidedProxy(clientSide = "de.ellpeck.actuallyadditions.proxy.ClientProxy", serverSide = "de.ellpeck.actuallyadditions.proxy.ServerProxy") + @SidedProxy(clientSide = "ClientProxy", serverSide = "ServerProxy") public static IProxy proxy; @EventHandler diff --git a/src/main/java/de/ellpeck/actuallyadditions/achievement/InitAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/achievement/InitAchievements.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java index 27be217f3..e8bf4f7eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/achievement/InitAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.achievement; +package de.ellpeck.actuallyadditions.mod.achievement; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; diff --git a/src/main/java/de/ellpeck/actuallyadditions/achievement/TheAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/achievement/TheAchievements.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java index 1970f2ec5..09043220f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/achievement/TheAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.achievement; +package de.ellpeck.actuallyadditions.mod.achievement; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index 8b59db5db..e33c1bf94 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -8,16 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.items.lens.ItemLens; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.api.lens.ILensItem; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; @@ -104,7 +105,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud if(reconstructor != null){ ItemStack heldItem = player.getCurrentEquippedItem(); if(heldItem != null){ - if(heldItem.getItem() instanceof ItemLens && reconstructor.getStackInSlot(0) == null){ + if(heldItem.getItem() instanceof ILensItem && reconstructor.getStackInSlot(0) == null){ ItemStack toPut = heldItem.copy(); toPut.stackSize = 1; reconstructor.setInventorySlotContents(0, toPut); diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java index aff2ac14d..7954e0dfe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBushBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBookletStand.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java index bdbc6da6d..eb257a18f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java @@ -8,18 +8,19 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.booklet.EntrySet; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.tile.TileEntityBookletStand; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.booklet.EntrySet; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index b9b5b6a60..5b36fbf9c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 66ecba2e4..28c441007 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index f4dfe8821..7ce2ee76a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 7129aded5..9fbeb1dee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 72adbf79c..74ca7fd70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCompost.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index 548f47aab..2894c3b8d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -8,17 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.items.ItemFertilizer; -import de.ellpeck.actuallyadditions.items.ItemMisc; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.items.ItemFertilizer; +import de.ellpeck.actuallyadditions.mod.items.ItemMisc; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCrystal.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index dd8646008..5a51de291 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java index 9b0cb071e..7227c7c9c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index 04b02e0a4..21caf5b97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityDropper; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 6cbc54609..acc52ee4e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer; -import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index 43b682d36..37da94b21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFeeder; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index 226db1cd3..319f3ded3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index 02eb9a1a0..8a642e035 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFireworkBox; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFishingNet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index 2c4125b03..d03ddcbf1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFishingNet; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFishingNet; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index e313234ac..7a213f3c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 38a64e10f..8c3a8d4c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index 7ea764781..e1d37702f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceSolar; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGeneric.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java index 2fa4be02c..27f276dc0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index 5f921d3bb..cab7a465e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java index 538cd0613..10412a56d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGreenhouseGlass; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGreenhouseGlass; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index 92d47e17d..2690cd100 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java index cab6d59de..b313fd2ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityHeatCollector; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityHeatCollector; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index 82344cfe0..a5fb4bd30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -8,19 +8,19 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityInputter; -import de.ellpeck.actuallyadditions.tile.TileEntityInventoryBase; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java index 344c216c0..3a5efdd99 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java index 647ec38b3..eb6457cfb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 0bfd0cb05..bce6d5595 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index fbd57a743..919f8e234 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -8,14 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityLavaFactoryController; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLavaFactoryController; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java index b3d79dd31..ba7f30f08 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityLeafGenerator; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLeafGenerator; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index 49ac3f5e9..d6735a384 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -8,16 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockMisc.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java index 3500bbb49..fa0313e9d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 1d6e39b8c..88fd13712 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockPhantom.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index 5c7c53bf0..18677c526 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -8,16 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.tile.*; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.tile.*; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index 6fc76f328..8383af6d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPhantomBooster; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomBooster; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index 63d9aaea8..1c5d6ea3f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockSlabs.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index 1dce8e29e..f2bca8e28 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index 2679e0c53..6032bdb3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.achievement.TheAchievements; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java index 94d9c66ba..d9474d5bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -8,15 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.achievement.TheAchievements; -import de.ellpeck.actuallyadditions.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.recipe.TreasureChestHandler; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; +import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -146,7 +147,7 @@ public class BlockTreasureChest extends BlockBase{ private void dropItems(World world, int x, int y, int z){ for(int i = 0; i < MathHelper.getRandomIntegerInRange(Util.RANDOM, 3, 6); i++){ - TreasureChestHandler.Return theReturn = (TreasureChestHandler.Return)WeightedRandom.getRandomItem(Util.RANDOM, TreasureChestHandler.returns); + TreasureChestLoot theReturn = (TreasureChestLoot)WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.treasureChestLoot); ItemStack itemStack = theReturn.returnItem.copy(); itemStack.stackSize = MathHelper.getRandomIntegerInRange(Util.RANDOM, theReturn.minAmount, theReturn.maxAmount); diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockWildPlant.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java index cbbec9361..f27983428 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockBushBase; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; -import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index 7547da246..c760abd56 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/FluidAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java index 7f5523b33..369406f9a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/FluidAA.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraftforge.fluids.Fluid; public class FluidAA extends Fluid{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/InitBlocks.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index ff4f43668..9317d87c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks; +package de.ellpeck.actuallyadditions.mod.blocks; -import de.ellpeck.actuallyadditions.blocks.base.BlockFluidFlowing; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.blocks.base.BlockStair; -import de.ellpeck.actuallyadditions.blocks.base.BlockWallAA; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.util.CompatUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockFluidFlowing; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockStair; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockWallAA; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.util.CompatUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index 606ae2829..ba8583f3d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index cd6b6f881..e8bf45e7a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.BlockBush; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index 7a9f22786..75dcb8c74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.tile.*; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.tile.*; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockRedstoneTorch; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index 9aca1fb5a..9d2904dd2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockPlant.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index c944c2bae..20fc6f7ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.BlockCrops; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockStair.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index 1b67cb59a..23801f1f0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java index 964d9422c..73bb30c6b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/ItemBlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/base/ItemBlockBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java index d4605a950..e52750253 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/base/ItemBlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.base; +package de.ellpeck.actuallyadditions.mod.blocks.base; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java index 17ae4913c..384246947 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.metalists; +package de.ellpeck.actuallyadditions.mod.blocks.metalists; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; public enum TheColoredLampColors{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java index 6b8d154a9..2980ce7e2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.metalists; +package de.ellpeck.actuallyadditions.mod.blocks.metalists; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java index 691989746..862298d81 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.metalists; +package de.ellpeck.actuallyadditions.mod.blocks.metalists; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderInventory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderInventory.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java index 1ee7019c6..17af8debd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderInventory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderInventory.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.mod.blocks.render; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java index 5e259c080..9d0bfdbda 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.mod.blocks.render; -import de.ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA; +import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderReconstructorLens.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java index d260976bc..295849a27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderReconstructorLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.mod.blocks.render; -import de.ellpeck.actuallyadditions.items.lens.ItemLens; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.api.lens.ILensItem; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -27,7 +27,7 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{ } ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0); - if(stack != null && stack.getItem() instanceof ItemLens){ + if(stack != null && stack.getItem() instanceof ILensItem){ GL11.glPushMatrix(); GL11.glTranslatef((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java index 68f658b99..cd4b4866e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.mod.blocks.render; -import de.ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA; -import de.ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg; -import de.ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; +import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg; +import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java index 4690b1d45..83878b964 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render; +package de.ellpeck.actuallyadditions.mod.blocks.render; -import de.ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelBaseAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelBaseAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java index bbd25f4f6..3596c5699 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelBaseAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelBase; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelBookletStand.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java index 931d310fd..dd369ab4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java index 77d43a5e5..858e5a85d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelCompost.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java index 781f8b4ac..d7dc69737 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelFishingNet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java index ddad1d51a..a7747ea78 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelFurnaceSolar.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java index ab632f8ce..2b1ad9242 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java index 8d1ee0bea..520ddcfd3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelPhantomBooster.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java index 269d59dcd..b96beda9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java index ae6404791..d15218459 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/blocks/render/model/ModelSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.blocks.render.model; +package de.ellpeck.actuallyadditions.mod.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java index 7bb5a84fd..219796e95 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet; +package de.ellpeck.actuallyadditions.mod.booklet; -import de.ellpeck.actuallyadditions.achievement.InitAchievements; -import de.ellpeck.actuallyadditions.booklet.button.BookmarkButton; -import de.ellpeck.actuallyadditions.booklet.button.IndexButton; -import de.ellpeck.actuallyadditions.booklet.button.TexturedButton; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllSearch; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.util.*; +import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; +import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton; +import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton; +import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.util.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/EntrySet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/EntrySet.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/EntrySet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/EntrySet.java index 76d324e2a..85fec21a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/EntrySet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/EntrySet.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet; +package de.ellpeck.actuallyadditions.mod.booklet; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; import net.minecraft.nbt.NBTTagCompound; public class EntrySet{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiAAAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/GuiAAAchievements.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java index a864b9d6e..12a3c628e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiAAAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet; +package de.ellpeck.actuallyadditions.mod.booklet; import cpw.mods.fml.relauncher.ReflectionHelper; -import de.ellpeck.actuallyadditions.achievement.InitAchievements; +import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java index bb78afc1d..906295e07 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java @@ -8,22 +8,22 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet; +package de.ellpeck.actuallyadditions.mod.booklet; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.button.BookmarkButton; -import de.ellpeck.actuallyadditions.booklet.button.IndexButton; -import de.ellpeck.actuallyadditions.booklet.button.TexturedButton; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllSearch; -import de.ellpeck.actuallyadditions.config.GuiConfiguration; -import de.ellpeck.actuallyadditions.items.ItemBooklet; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.update.UpdateChecker; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.playerdata.PersistentClientData; +import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton; +import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton; +import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch; +import de.ellpeck.actuallyadditions.mod.config.GuiConfiguration; +import de.ellpeck.actuallyadditions.mod.items.ItemBooklet; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.update.UpdateChecker; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBookletStand.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java index 5545785c4..99493b6f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet; +package de.ellpeck.actuallyadditions.mod.booklet; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.network.PacketBookletStandButton; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBookletStand; +import de.ellpeck.actuallyadditions.mod.network.PacketBookletStandButton; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 62d428542..644de59b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -8,26 +8,26 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet; +package de.ellpeck.actuallyadditions.mod.booklet; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterCoffee; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterCrusher; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllSearch; -import de.ellpeck.actuallyadditions.booklet.page.*; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.crafting.*; -import de.ellpeck.actuallyadditions.gen.OreGen; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.*; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterCoffee; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterCrusher; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch; +import de.ellpeck.actuallyadditions.mod.booklet.page.*; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.crafting.*; +import de.ellpeck.actuallyadditions.mod.gen.OreGen; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.lens.LensNoneRecipeHandler; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.tile.*; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java index d0a89f84e..3359bfcff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.button; +package de.ellpeck.actuallyadditions.mod.booklet.button; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.EntrySet; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.KeyUtil; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.EntrySet; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.KeyUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/IndexButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/button/IndexButton.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java index 60a38e246..86b75f3fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/IndexButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.button; +package de.ellpeck.actuallyadditions.mod.booklet.button; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/button/TexturedButton.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java index a215eb144..47778c1eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.button; +package de.ellpeck.actuallyadditions.mod.booklet.button; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java index f2577152a..fa00329a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.chapter; +package de.ellpeck.actuallyadditions.mod.booklet.chapter; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java similarity index 69% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java index d49da5681..ec604672a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java @@ -8,12 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.chapter; +package de.ellpeck.actuallyadditions.mod.booklet.chapter; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.booklet.page.PageCoffeeRecipe; -import de.ellpeck.actuallyadditions.items.ItemCoffee; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageCoffeeRecipe; +import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; import net.minecraft.item.ItemStack; import java.util.ArrayList; @@ -30,7 +32,7 @@ public class BookletChapterCoffee extends BookletChapter{ ArrayList allPages = new ArrayList(); allPages.addAll(Arrays.asList(pages)); - for(ItemCoffee.Ingredient ingredient : ItemCoffee.ingredients){ + for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.coffeeMachineIngredients){ BookletPage page = new PageCoffeeRecipe(allPages.size()+1, ingredient); if(!(ingredient instanceof ItemCoffee.MilkIngredient)){ page.setNoText(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java similarity index 70% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java index c49eb7d01..8b2eb85d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.chapter; +package de.ellpeck.actuallyadditions.mod.booklet.chapter; -import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.booklet.page.PageCrusherRecipe; -import de.ellpeck.actuallyadditions.crafting.CrusherCrafting; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrusherRecipe; +import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; import net.minecraft.item.ItemStack; import java.util.ArrayList; @@ -31,7 +31,7 @@ public class BookletChapterCrusher extends BookletChapter{ ArrayList allPages = new ArrayList(); allPages.addAll(Arrays.asList(pages)); - for(CrusherRecipeRegistry.CrusherRecipe recipe : CrusherCrafting.miscRecipes){ + for(CrusherRecipe recipe : CrusherCrafting.miscRecipes){ allPages.add(new PageCrusherRecipe(allPages.size()+1, recipe).setNoText()); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java index 4c9321fb9..a18df8475 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.entry; +package de.ellpeck.actuallyadditions.mod.booklet.entry; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.util.EnumChatFormatting; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllSearch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllSearch.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java index 543741ce9..efda9f5e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllSearch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.entry; +package de.ellpeck.actuallyadditions.mod.booklet.entry; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; import java.util.ArrayList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/BookletPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/BookletPage.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java index d206773e9..7f3fb0eb6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/BookletPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java index 6544e9023..2019961d8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java @@ -8,25 +8,26 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemCoffee; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; public class PageCoffeeRecipe extends BookletPage{ - public ItemCoffee.Ingredient ingredient; + public CoffeeIngredient ingredient; - public PageCoffeeRecipe(int id, ItemCoffee.Ingredient ingredient){ + public PageCoffeeRecipe(int id, CoffeeIngredient ingredient){ super(id); this.ingredient = ingredient; } @@ -73,7 +74,7 @@ public class PageCoffeeRecipe extends BookletPage{ break; case 2: stack = new ItemStack(InitItems.itemCoffee); - ItemCoffee.addEffectToStack(stack, this.ingredient); + CoffeeBrewing.addEffectToStack(stack, this.ingredient); coordsOffsetX = 39; coordsOffsetY = 39; break; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java index 9b29ee559..844954dc7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java index 333009465..8e24982ee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -27,11 +27,11 @@ import java.util.List; public class PageCrusherRecipe extends BookletPage{ - public CrusherRecipeRegistry.CrusherRecipe recipe; + public CrusherRecipe recipe; private int recipePos; - public PageCrusherRecipe(int id, CrusherRecipeRegistry.CrusherRecipe recipe){ + public PageCrusherRecipe(int id, CrusherRecipe recipe){ super(id); this.recipe = recipe; this.addToPagesWithItemStackData(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageFurnace.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java index 062e481b4..3760848bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PagePicture.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PagePicture.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java index 2c68b2209..cf5db7089 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PagePicture.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.util.ResourceLocation; public class PagePicture extends PageTextOnly{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java index 343c22c95..17c9ecaeb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -28,14 +28,14 @@ import java.util.List; public class PageReconstructor extends BookletPage{ - private LensNoneRecipeHandler.Recipe[] recipes; + private LensNoneRecipe[] recipes; private int recipePos; - public PageReconstructor(int id, ArrayList recipes){ - this(id, recipes.toArray(new LensNoneRecipeHandler.Recipe[recipes.size()])); + public PageReconstructor(int id, ArrayList recipes){ + this(id, recipes.toArray(new LensNoneRecipe[recipes.size()])); } - public PageReconstructor(int id, LensNoneRecipeHandler.Recipe... recipes){ + public PageReconstructor(int id, LensNoneRecipe... recipes){ super(id); this.recipes = recipes; this.addToPagesWithItemStackData(); @@ -45,7 +45,7 @@ public class PageReconstructor extends BookletPage{ public ItemStack[] getItemStacksForPage(){ if(this.recipes != null){ ArrayList stacks = new ArrayList(); - for(LensNoneRecipeHandler.Recipe recipe : this.recipes){ + for(LensNoneRecipe recipe : this.recipes){ if(recipe != null){ stacks.addAll(recipe.getOutputs()); } @@ -68,7 +68,7 @@ public class PageReconstructor extends BookletPage{ @Override @SideOnly(Side.CLIENT) public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ - LensNoneRecipeHandler.Recipe recipe = this.recipes[this.recipePos]; + LensNoneRecipe recipe = this.recipes[this.recipePos]; if(recipe == null){ StringUtil.drawSplitString(gui.mc.fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.guiLeft+14, gui.guiTop+15, 115, 0, false); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java index 8f4ffeeee..2f5c40739 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.booklet.page; +package de.ellpeck.actuallyadditions.mod.booklet.page; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.item.ItemStack; public class PageTextOnly extends BookletPage{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/ConfigCategories.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/config/ConfigCategories.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java index 35edf63fd..5633d3056 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/ConfigCategories.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.mod.config; public enum ConfigCategories{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/ConfigValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/config/ConfigValues.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java index 4c1003bf0..027c25924 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/ConfigValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.mod.config; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import net.minecraftforge.common.config.Configuration; public class ConfigValues{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/ConfigurationHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/config/ConfigurationHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java index 6d9c9e98d..74940a7a3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/ConfigurationHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.mod.config; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraftforge.common.config.Configuration; import java.io.File; diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/GuiConfiguration.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/config/GuiConfiguration.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java index 31871b1fb..d291a4734 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/GuiConfiguration.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.mod.config; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/GuiFactory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/config/GuiFactory.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java index 093dfd997..8399db8bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/GuiFactory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config; +package de.ellpeck.actuallyadditions.mod.config; import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java index e3866d77d..617d3f79d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.mod.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; -import de.ellpeck.actuallyadditions.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; +import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; public enum ConfigBoolValues{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java index 9b8e05ed2..8c6e3cf21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.mod.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; +import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; public enum ConfigCrafting{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigIntValues.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java index 99b904d26..59344495d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.config.values; +package de.ellpeck.actuallyadditions.mod.config.values; -import de.ellpeck.actuallyadditions.config.ConfigCategories; +import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; public enum ConfigIntValues{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/crafting/BlockCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index da3caab19..b12d825dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.mod.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.blocks.BlockColoredLamp; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.BlockColoredLamp; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java new file mode 100644 index 000000000..91c307a7e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java @@ -0,0 +1,110 @@ +/* + * This file ("CrusherCrafting.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.crafting; + +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; + +public class CrusherCrafting{ + + public static CrusherRecipe recipeIronHorseArmor; + public static CrusherRecipe recipeGoldHorseArmor; + public static CrusherRecipe recipeDiamondHorseArmor; + public static ArrayList miscRecipes = new ArrayList(); + + public static void init(){ + ModUtil.LOGGER.info("Initializing Crusher Recipes..."); + + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.reeds), new ItemStack(Items.sugar, 3)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.yellow_flower), new ItemStack(Items.dye, 3, 11)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 3, 1)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 3, 12)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Items.dye, 3, 13)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 3), new ItemStack(Items.dye, 3, 7)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 4), new ItemStack(Items.dye, 3, 1)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 5), new ItemStack(Items.dye, 3, 14)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 6), new ItemStack(Items.dye, 3, 7)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 7), new ItemStack(Items.dye, 3, 9)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 8), new ItemStack(Items.dye, 3, 7)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 0), new ItemStack(Items.dye, 4, 11)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Items.dye, 4, 13)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Items.dye, 4, 1)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Items.dye, 4, 9)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + + ActuallyAdditionsAPI.addCrusherRecipe("oreRedstone", "dustRedstone", 10); + ActuallyAdditionsAPI.addCrusherRecipe("oreLapis", "gemLapis", 12); + ActuallyAdditionsAPI.addCrusherRecipe("coal", "dustCoal", 1); + ActuallyAdditionsAPI.addCrusherRecipe("oreCoal", "coal", 3); + ActuallyAdditionsAPI.addCrusherRecipe("blockCoal", "coal", 9); + ActuallyAdditionsAPI.addCrusherRecipe("oreQuartz", "gemQuartz", 3); + ActuallyAdditionsAPI.addCrusherRecipe("cobblestone", "sand", 1); + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint), new ItemStack(Items.flint), 50); + ActuallyAdditionsAPI.addCrusherRecipe("stone", "cobblestone", 1); + + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 2)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + + ActuallyAdditionsAPI.addCrusherRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15); + ActuallyAdditionsAPI.addCrusherRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20); + + if(ConfigCrafting.HORSE_ARMORS.isEnabled()){ + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.iron_horse_armor), "dustIron", 8); + recipeIronHorseArmor = Util.GetRecipes.lastCrusherRecipe(); + + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.golden_horse_armor), "dustGold", 8); + recipeGoldHorseArmor = Util.GetRecipes.lastCrusherRecipe(); + + ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.diamond_horse_armor), "dustDiamond", 8); + recipeDiamondHorseArmor = Util.GetRecipes.lastCrusherRecipe(); + } + + CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("oreNether", 6)); + CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("orePoor", 4, "nugget")); + CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("denseore", 8)); + CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("gem", 1)); + CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("ingot", 1)); + CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("ore", 2)); + + CrusherRecipeRegistry.registerFinally(); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java index 24d42f3c1..1c5ce4981 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.mod.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/crafting/InitCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java index d4cbeb7dc..3a7c57cf9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.mod.crafting; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; public class InitCrafting{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/crafting/ItemCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 60df8d230..4a7102a3d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.mod.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.*; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.*; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.IGrowable; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/crafting/MiscCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java index 2872ace08..d6d23082d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/MiscCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.mod.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java index 12de75bf4..08c35de25 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.crafting; +package de.ellpeck.actuallyadditions.mod.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 702430677..2892dae62 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.creative; +package de.ellpeck.actuallyadditions.mod.creative; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitForeignPaxels; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/BucketFillEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/event/BucketFillEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java index c20f19550..28af86047 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/BucketFillEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/BucketFillEvent.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitItems; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/EntityLivingEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/event/EntityLivingEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java index 2e5fcd1f2..cd0400cb1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/EntityLivingEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemWingsOfTheBats; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/HudEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/event/HudEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java index 4f1a86f6e..41fa9d6a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/HudEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.blocks.IHudDisplay; -import de.ellpeck.actuallyadditions.tile.IEnergyDisplay; -import de.ellpeck.actuallyadditions.tile.IRedstoneToggle; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.tile.IRedstoneToggle; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneTorch; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/InitEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java similarity index 78% rename from src/main/java/de/ellpeck/actuallyadditions/event/InitEvents.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java index 302a98f3e..6571dc5b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/InitEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.Loader; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.nei.NEIScreenEvents; -import de.ellpeck.actuallyadditions.update.UpdateCheckerClientNotificationEvent; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.nei.NEIScreenEvents; +import de.ellpeck.actuallyadditions.mod.update.UpdateCheckerClientNotificationEvent; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraftforge.common.MinecraftForge; public class InitEvents{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/LivingDropEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/event/LivingDropEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java index d3051c9e7..670af2274 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/LivingDropEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.passive.EntityBat; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/LogoutEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/event/LogoutEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java index 63f3dfccb..f2cf9d19b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/LogoutEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import de.ellpeck.actuallyadditions.items.ItemWingsOfTheBats; +import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats; public class LogoutEvent{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/PlayerObtainEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/event/PlayerObtainEvents.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java index 8476b32aa..5298c7744 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/PlayerObtainEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import de.ellpeck.actuallyadditions.achievement.InitAchievements; -import de.ellpeck.actuallyadditions.achievement.TheAchievements; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.misc.WorldData; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.playerdata.PersistentServerData; +import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; +import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.misc.WorldData; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentServerData; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/TooltipEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/event/TooltipEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java index f13bb9a08..ed04f0706 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/TooltipEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.util.KeyUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.util.KeyUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/WorldDecorationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/event/WorldDecorationEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java index 8d948d63b..313d588e8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/WorldDecorationEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.biome.BiomeGenOcean; diff --git a/src/main/java/de/ellpeck/actuallyadditions/event/WorldLoadingEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/event/WorldLoadingEvents.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java index 18e827681..1f28e41ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/event/WorldLoadingEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.event; +package de.ellpeck.actuallyadditions.mod.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.misc.LaserRelayConnectionHandler; -import de.ellpeck.actuallyadditions.misc.WorldData; +import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; +import de.ellpeck.actuallyadditions.mod.misc.WorldData; import net.minecraftforge.event.world.WorldEvent; public class WorldLoadingEvents{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/InitVillager.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/gen/InitVillager.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java index dd0b3cf91..e9de392f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/InitVillager.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; import cpw.mods.fml.common.registry.VillagerRegistry; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java index 019762b12..232558eac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; import cpw.mods.fml.common.registry.VillagerRegistry; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/OreGen.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/gen/OreGen.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java index 6af3d1289..7ab3e8097 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/OreGen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java index babf3defa..98f23d755 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java index 73f6dd0b9..b525b966b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageCustomCropFieldHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/gen/VillageCustomCropFieldHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java index 594d4a5e5..75d078aa7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageCustomCropFieldHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; import cpw.mods.fml.common.registry.VillagerRegistry; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/gen/VillageJamHouseHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java index efb223c6e..2910e7ce5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/gen/VillageJamHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.gen; +package de.ellpeck.actuallyadditions.mod.gen; import cpw.mods.fml.common.registry.VillagerRegistry; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java index 5d36d4cc5..35e952d42 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java index 0d1b5aaaa..741f35f77 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java index e2f43de52..6c7dacdfa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java index 4f0aa9d33..d9e5a4824 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemCoffee; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCrafter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java index b2b345c64..7db458e36 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java index 0ac54a7f7..09523d780 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index 6045576c4..c02a4cc91 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; import cofh.api.energy.IEnergyContainerItem; -import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.items.ItemDrill; -import de.ellpeck.actuallyadditions.items.ItemDrillUpgrade; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.mod.items.ItemDrill; +import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java index 4005d571a..f6b268e0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDropper; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java index 6e58c958a..4272e5b1d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerEnervator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java index 8f6c7857c..a5b0411b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java index 8869caf20..267b17a25 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFeeder; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java index 2e4cf687b..02cd7b5c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java index c25ff87e4..0ff708024 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java index 2c0df1f7f..b048ad84d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java index f3a772a90..f28af7335 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; import invtweaks.api.container.ChestContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java index a845660a8..8d7b36b63 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java index 62d6de078..82efa927d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter; -import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java index db1101127..e42b19279 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java index 62b294559..657eafe44 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java index 038af78b4..b41246de6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java index 9f205003c..89eb7b93c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java index 133e00801..c75ab13c4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java index ef88aef8e..586303d7a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java index 6b5944fce..961b346f2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/GuiHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java index 204c90710..5091d906b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/GuiHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory; +package de.ellpeck.actuallyadditions.mod.inventory; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.booklet.GuiBookletStand; -import de.ellpeck.actuallyadditions.inventory.gui.*; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBookletStand; +import de.ellpeck.actuallyadditions.mod.inventory.gui.*; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java index 74062379a..bae4df8a2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerBreaker; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerBreaker; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index 5cd64d95f..daaab89d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerCanolaPress; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerCanolaPress; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index e37141ae0..894188f72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerCoalGenerator; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoalGenerator; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index 46e200088..3d0c443f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerCoffeeMachine; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiButton; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCrafter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java index 06f2fe524..6d282f751 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerCrafter; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerCrafter; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index 8d0fe280e..4855a3589 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerDirectionalBreaker; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerDirectionalBreaker; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index 1228ffc98..b87a2cabe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerDrill; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerDrill; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index 6bbe0e133..e6a58242e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerDropper; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityDropper; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerDropper; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index b80d67705..b8aa7d0a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerEnergizer; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnergizer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index 137c63b1f..06edf819e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerEnervator; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnervator; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index d3ef8ebc7..72ed73899 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerFeeder; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFeeder; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerFeeder; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index 7c5e41bee..f2973c826 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerFermentingBarrel; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerFermentingBarrel; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index fe0c3e12a..eb045ba56 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerFluidCollector; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerFluidCollector; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index 70c1f359a..c01c42b63 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerFurnaceDouble; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java index d66c12970..c6886eaf8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerGiantChest; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java index f70c5c745..a1b577afd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerGrinder; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerGrinder; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index f92ca51a2..f9bc8901c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -8,19 +8,19 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerInputter; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiButton; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiNumber; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityInputter; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerInputter; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiNumber; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java index 683ffc726..aa36e573b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerMiner; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiButton; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index 65a4584aa..b496249bf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerOilGenerator; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerOilGenerator; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index 1f4ed6660..2384e1295 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerPhantomPlacer; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityPhantomPlacer; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerPhantomPlacer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index 83afc8aba..12e6a091b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerRangedCollector; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiButton; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerRangedCollector; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java index dc6a157a9..9f7419ea6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerRepairer; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerRepairer; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java index 2a337c8c2..ca4ea5b6b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerSmileyCloud; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiString; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerSmileyCloud; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiString; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index 722e0c27b..927ef180e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.gui; +package de.ellpeck.actuallyadditions.mod.inventory.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.ContainerXPSolidifier; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiButton; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerXPSolidifier; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotFilter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java index 4f9c14134..77042179f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.mod.inventory.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java index 1f4f970e9..91e13df92 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.mod.inventory.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotOutput.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotOutput.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java index 543307821..98b004186 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/inventory/slot/SlotOutput.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.inventory.slot; +package de.ellpeck.actuallyadditions.mod.inventory.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/InitForeignPaxels.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/items/InitForeignPaxels.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java index a63b504f5..0ca1e7904 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/InitForeignPaxels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; -import de.ellpeck.actuallyadditions.crafting.ToolCrafting; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.items.base.ItemAllToolAA; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.crafting.ToolCrafting; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.items.base.ItemAllToolAA; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemTool; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index fca61a447..5ac491d90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -8,20 +8,20 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.base.*; -import de.ellpeck.actuallyadditions.items.lens.ItemLens; -import de.ellpeck.actuallyadditions.items.lens.Lenses; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.material.InitArmorMaterials; -import de.ellpeck.actuallyadditions.material.InitToolMaterials; -import de.ellpeck.actuallyadditions.util.CompatUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.base.*; +import de.ellpeck.actuallyadditions.mod.items.lens.ItemLens; +import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.material.InitArmorMaterials; +import de.ellpeck.actuallyadditions.mod.material.InitToolMaterials; +import de.ellpeck.actuallyadditions.mod.util.CompatUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemBattery.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java index 79f9f0fb7..876c0da5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemBooklet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index ddc22ca7b..6cc4ee07c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -8,23 +8,23 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.achievement.TheAchievements; -import de.ellpeck.actuallyadditions.blocks.IHudDisplay; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.EntrySet; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.block.IHudDisplay; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.EntrySet; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index e32d08072..44dbb5073 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockChest; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java new file mode 100644 index 000000000..09759a516 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -0,0 +1,179 @@ +/* + * This file ("ItemCoffee.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.items; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; +import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.EnumAction; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.util.StringUtils; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; + +public class ItemCoffee extends ItemFoodBase{ + + public ItemCoffee(String name){ + super(8, 5.0F, false, name); + this.setMaxDamage(3); + this.setAlwaysEdible(); + this.setMaxStackSize(1); + this.setNoRepair(); + } + + public static void initIngredients(){ + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new MilkIngredient(new ItemStack(Items.milk_bucket))); + //Pam's Soy Milk (For Jemx because he's lactose intolerant. YER HAPPY NAO!?) + if(Loader.isModLoaded("harvestcraft")){ + Item item = ItemUtil.getItemFromName("harvestcraft:soymilkItem"); + if(item != null){ + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new MilkIngredient(new ItemStack(item))); + } + } + + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.sugar), new PotionEffect[]{new PotionEffect(Potion.moveSpeed.getId(), 30, 0)}, 4)); + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.magma_cream), new PotionEffect[]{new PotionEffect(Potion.fireResistance.getId(), 20, 0)}, 2)); + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.fish, 1, 3), new PotionEffect[]{new PotionEffect(Potion.waterBreathing.getId(), 10, 0)}, 2)); + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.golden_carrot), new PotionEffect[]{new PotionEffect(Potion.nightVision.getId(), 30, 0)}, 2)); + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.ghast_tear), new PotionEffect[]{new PotionEffect(Potion.regeneration.getId(), 5, 0)}, 3)); + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.blaze_powder), new PotionEffect[]{new PotionEffect(Potion.damageBoost.getId(), 15, 0)}, 4)); + ActuallyAdditionsAPI.addCoffeeMachineIngredient(new CoffeeIngredient(new ItemStack(Items.fermented_spider_eye), new PotionEffect[]{new PotionEffect(Potion.invisibility.getId(), 25, 0)}, 2)); + } + + public static CoffeeIngredient getIngredientFromStack(ItemStack stack){ + for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.coffeeMachineIngredients){ + if(ingredient.ingredient.copy().isItemEqual(stack)){ + return ingredient; + } + } + return null; + } + + @Override + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ + ItemStack theStack = stack.copy(); + super.onEaten(stack, world, player); + applyPotionEffectsFromStack(stack, player); + theStack.setItemDamage(theStack.getItemDamage()+1); + if(theStack.getMaxDamage()-theStack.getItemDamage() < 0){ + return new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()); + } + else{ + return theStack; + } + } + + public static void applyPotionEffectsFromStack(ItemStack stack, EntityPlayer player){ + PotionEffect[] effects = CoffeeBrewing.getEffectsFromStack(stack); + if(effects != null && effects.length > 0){ + for(PotionEffect effect : effects){ + player.addPotionEffect(new PotionEffect(effect.getPotionID(), effect.getDuration()*20, effect.getAmplifier())); + } + } + } + + @Override + public EnumAction getItemUseAction(ItemStack stack){ + return EnumAction.drink; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1){ + return this.itemIcon; + } + + @Override + public int getMetadata(int damage){ + return damage; + } + + @Override + public boolean getShareTag(){ + return true; + } + + @SuppressWarnings("unchecked") + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){ + PotionEffect[] effects = CoffeeBrewing.getEffectsFromStack(stack); + if(effects != null){ + for(PotionEffect effect : effects){ + list.add(StringUtil.localize(effect.getEffectName())+" "+(effect.getAmplifier()+1)+", "+StringUtils.ticksToElapsedTime(effect.getDuration()*20)); + } + } + else{ + list.add("No Effects"); + } + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName()); + } + + public static class MilkIngredient extends CoffeeIngredient{ + + public MilkIngredient(ItemStack ingredient){ + super(ingredient, null, 0); + } + + @Override + public boolean effect(ItemStack stack){ + PotionEffect[] effects = CoffeeBrewing.getEffectsFromStack(stack); + ArrayList effectsNew = new ArrayList(); + if(effects != null && effects.length > 0){ + for(PotionEffect effect : effects){ + if(effect.getAmplifier() > 0){ + effectsNew.add(new PotionEffect(effect.getPotionID(), effect.getDuration()+120, effect.getAmplifier()-1)); + } + } + stack.setTagCompound(new NBTTagCompound()); + if(effectsNew.size() > 0){ + this.effects = effectsNew.toArray(new PotionEffect[effectsNew.size()]); + CoffeeBrewing.addEffectToStack(stack, this); + } + } + this.effects = null; + return true; + } + + @Override + public String getExtraText(){ + return StringUtil.localize("container.nei."+ModUtil.MOD_ID_LOWER+".coffee.extra.milk"); + } + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffeeBean.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java index c709233ba..aa1079412 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java index 5305b2e83..1014d5911 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemCrystal.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index 52c0e704d..7c29da0db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.BlockCrystal; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.BlockCrystal; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 8e9ce0f07..1a39b8ad3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -8,20 +8,20 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cofh.api.energy.IEnergyContainerItem; import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.ActuallyAdditions; -import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java index 6642ba422..b7c7a22bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemDust.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index 7b67ffff8..7a0f24051 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemFertilizer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index ae89b605b..e11edd912 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemFoods.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index 05f8d4c2c..61dc3c9c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemGeneric.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java index 07ee0e8dd..eee02d5ae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemGrowthRing.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index 3b6155613..c34cfaae0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; import net.minecraft.block.IGrowable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemHairyBall.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java index b6e561aac..52cfc181b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java @@ -8,14 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.recipe.HairyBallHandler; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -47,7 +48,7 @@ public class ItemHairyBall extends ItemBase{ } public ItemStack getRandomReturnItem(){ - return ((HairyBallHandler.Return)WeightedRandom.getRandomItem(Util.RANDOM, HairyBallHandler.returns)).returnItem.copy(); + return ((BallOfFurReturn)WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.ballOfFurReturnItems)).returnItem.copy(); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemJams.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index 0d74d989d..be4f9301b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemKnife.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java index de9960675..c50f7609e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemLaserWrench.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index 12898660b..cc67f58c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.misc.LaserRelayConnectionHandler; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemLeafBlower.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index d97d87fe9..0d216d4a1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Position; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemMagnetRing.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index bcd3c440e..16b307089 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemMisc.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index e62f17f1c..312de25d8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemPhantomConnector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index f8ca39822..9550aa187 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.tile.IPhantomTile; -import de.ellpeck.actuallyadditions.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemPotionRing.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index 9246622db..c9cdf04b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.items.metalists.ThePotionRings; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.items.metalists.ThePotionRings; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemResonantRice.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java index 9f0049f82..4d58e6737 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemSeed.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java index afe016b1d..d4de3266d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSeed.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemSolidifiedExperience.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index ebed654b8..cbcd4cb1d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemTeleStaff.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index 759732731..c40772a6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java index d2065e09c..8e2ca8196 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 819d547ca..49b857391 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items; +package de.ellpeck.actuallyadditions.mod.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java index 9c46a3577..16c486a85 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java @@ -8,17 +8,17 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import com.google.common.collect.Sets; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index f12306821..fc8b8c4b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java index 6033b8a30..e45d8fa22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemAxe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java index 563f7157d..33a1e543c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemBucketAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemBucketAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java index 11b393ca5..bda610a17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemBucketAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemEnergy.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index a624fe9a1..c6500734d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cofh.api.energy.ItemEnergyContainer; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemFoodBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java index b123734d1..85938c9fb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemFoodBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.ItemFood; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java index 33b71ff43..32f7d747c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java index ea4cb60ab..fd43b29c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemPickaxe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java index 0c1dc2f42..dbb5cfffc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java index c26bada27..9c18affac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.base; +package de.ellpeck.actuallyadditions.mod.items.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; -import de.ellpeck.actuallyadditions.creative.CreativeTab; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; +import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java similarity index 76% rename from src/main/java/de/ellpeck/actuallyadditions/items/lens/ItemLens.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java index 58aed8107..f8a22c60e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java @@ -8,18 +8,20 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.mod.items.lens; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.base.ItemBase; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.api.lens.ILensItem; +import de.ellpeck.actuallyadditions.api.lens.Lens; +import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -public class ItemLens extends ItemBase{ +public class ItemLens extends ItemBase implements ILensItem{ private Lens type; @@ -47,7 +49,8 @@ public class ItemLens extends ItemBase{ return this.itemIcon; } - public Lens getLensType(){ + @Override + public Lens getLens(){ return this.type; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/items/lens/LensColor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java index 2295607e4..64fc2e451 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensColor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java @@ -8,12 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.mod.items.lens; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor; +import de.ellpeck.actuallyadditions.api.lens.Lens; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -53,9 +54,9 @@ public class LensColor extends Lens{ @SuppressWarnings("unchecked") @Override - public boolean invoke(Position hitBlock, TileEntityAtomicReconstructor tile){ + public boolean invoke(Position hitBlock, IAtomicReconstructor tile){ if(hitBlock != null){ - if(Util.arrayContains(CONVERTABLE_BLOCKS, hitBlock.getBlock(tile.getWorldObj())) >= 0 && tile.storage.getEnergyStored() >= ENERGY_USE){ + if(Util.arrayContains(CONVERTABLE_BLOCKS, hitBlock.getBlock(tile.getWorldObj())) >= 0 && tile.getEnergy() >= ENERGY_USE){ int meta = hitBlock.getMetadata(tile.getWorldObj()); if(meta >= 15){ hitBlock.setMetadata(tile.getWorldObj(), 0, 2); @@ -63,12 +64,12 @@ public class LensColor extends Lens{ else{ hitBlock.setMetadata(tile.getWorldObj(), meta+1, 2); } - tile.storage.extractEnergy(ENERGY_USE, false); + tile.extractEnergy(ENERGY_USE); } ArrayList items = (ArrayList)tile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(hitBlock.getX(), hitBlock.getY(), hitBlock.getZ(), hitBlock.getX()+1, hitBlock.getY()+1, hitBlock.getZ()+1)); for(EntityItem item : items){ - if(item.getEntityItem() != null && tile.storage.getEnergyStored() >= ENERGY_USE){ + if(item.getEntityItem() != null && tile.getEnergy() >= ENERGY_USE){ if(Util.arrayContains(CONVERTABLE_BLOCKS, item.getEntityItem().getItem()) >= 0 || Util.arrayContains(CONVERTABLE_BLOCKS, Block.getBlockFromItem(item.getEntityItem().getItem())) >= 0){ int meta = item.getEntityItem().getItemDamage(); if(meta >= 15){ @@ -77,7 +78,7 @@ public class LensColor extends Lens{ else{ item.getEntityItem().setItemDamage(meta+1); } - tile.storage.extractEnergy(ENERGY_USE, false); + tile.extractEnergy(ENERGY_USE); } } } @@ -95,4 +96,4 @@ public class LensColor extends Lens{ public int getDistance(){ return 10; } -} +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensDeath.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java similarity index 77% rename from src/main/java/de/ellpeck/actuallyadditions/items/lens/LensDeath.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java index 3c52acbb9..f2e27edff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensDeath.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java @@ -8,11 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.mod.items.lens; -import de.ellpeck.actuallyadditions.misc.DamageSources; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.Position; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor; +import de.ellpeck.actuallyadditions.api.lens.Lens; +import de.ellpeck.actuallyadditions.mod.misc.DamageSources; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.AxisAlignedBB; @@ -22,10 +23,10 @@ public class LensDeath extends Lens{ @SuppressWarnings("unchecked") @Override - public boolean invoke(Position hitBlock, TileEntityAtomicReconstructor tile){ + public boolean invoke(Position hitBlock, IAtomicReconstructor tile){ int use = 150; //Per Block (because it doesn't only activate when something is hit like the other lenses!) - if(tile.storage.getEnergyStored() >= use){ - tile.storage.extractEnergy(use, false); + if(tile.getEnergy() >= use){ + tile.extractEnergy(use); ArrayList entities = (ArrayList)tile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(hitBlock.getX(), hitBlock.getY(), hitBlock.getZ(), hitBlock.getX()+1, hitBlock.getY()+1, hitBlock.getZ()+1)); for(EntityLivingBase entity : entities){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensDetonation.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java similarity index 71% rename from src/main/java/de/ellpeck/actuallyadditions/items/lens/LensDetonation.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java index fd9fb65a7..579d78b86 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensDetonation.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java @@ -8,20 +8,21 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.mod.items.lens; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.Position; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor; +import de.ellpeck.actuallyadditions.api.lens.Lens; public class LensDetonation extends Lens{ @Override - public boolean invoke(Position hitBlock, TileEntityAtomicReconstructor tile){ + public boolean invoke(Position hitBlock, IAtomicReconstructor tile){ if(hitBlock != null && !hitBlock.getBlock(tile.getWorldObj()).isAir(tile.getWorldObj(), hitBlock.getX(), hitBlock.getY(), hitBlock.getZ())){ int use = 500000; - if(tile.storage.getEnergyStored() >= use){ + if(tile.getEnergy() >= use){ tile.getWorldObj().newExplosion(null, hitBlock.getX()+0.5, hitBlock.getY()+0.5, hitBlock.getZ()+0.5, 10F, true, true); - tile.storage.extractEnergy(use, false); + tile.extractEnergy(use); } return true; } @@ -37,4 +38,4 @@ public class LensDetonation extends Lens{ public int getDistance(){ return 30; } -} +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNone.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNone.java similarity index 76% rename from src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNone.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNone.java index 3a764c2c7..1a77437f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNone.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNone.java @@ -8,10 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.mod.items.lens; -import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.util.Position; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor; +import de.ellpeck.actuallyadditions.api.lens.Lens; +import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; @@ -25,7 +27,7 @@ public class LensNone extends Lens{ @SuppressWarnings("unchecked") @Override - public boolean invoke(Position hitBlock, TileEntityAtomicReconstructor tile){ + public boolean invoke(Position hitBlock, IAtomicReconstructor tile){ if(hitBlock != null && !hitBlock.getBlock(tile.getWorldObj()).isAir(tile.getWorldObj(), hitBlock.getX(), hitBlock.getY(), hitBlock.getZ())){ int range = 2; @@ -34,9 +36,9 @@ public class LensNone extends Lens{ for(int reachZ = -range; reachZ < range+1; reachZ++){ for(int reachY = -range; reachY < range+1; reachY++){ Position pos = new Position(hitBlock.getX()+reachX, hitBlock.getY()+reachY, hitBlock.getZ()+reachZ); - ArrayList recipes = LensNoneRecipeHandler.getRecipesFor(new ItemStack(pos.getBlock(tile.getWorldObj()), 1, pos.getMetadata(tile.getWorldObj()))); - for(LensNoneRecipeHandler.Recipe recipe : recipes){ - if(recipe != null && tile.storage.getEnergyStored() >= recipe.energyUse){ + List recipes = LensNoneRecipeHandler.getRecipesFor(new ItemStack(pos.getBlock(tile.getWorldObj()), 1, pos.getMetadata(tile.getWorldObj()))); + for(LensNoneRecipe recipe : recipes){ + if(recipe != null && tile.getEnergy() >= recipe.energyUse){ List outputs = recipe.getOutputs(); if(outputs != null && !outputs.isEmpty()){ ItemStack output = outputs.get(0); @@ -48,7 +50,7 @@ public class LensNone extends Lens{ EntityItem item = new EntityItem(tile.getWorldObj(), pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, output.copy()); tile.getWorldObj().spawnEntityInWorld(item); } - tile.storage.extractEnergy(recipe.energyUse, false); + tile.extractEnergy(recipe.energyUse); break; } } @@ -62,16 +64,16 @@ public class LensNone extends Lens{ for(EntityItem item : items){ ItemStack stack = item.getEntityItem(); if(stack != null){ - ArrayList recipes = LensNoneRecipeHandler.getRecipesFor(stack); - for(LensNoneRecipeHandler.Recipe recipe : recipes){ - if(recipe != null && tile.storage.getEnergyStored() >= recipe.energyUse){ + List recipes = LensNoneRecipeHandler.getRecipesFor(stack); + for(LensNoneRecipe recipe : recipes){ + if(recipe != null && tile.getEnergy() >= recipe.energyUse){ List outputs = recipe.getOutputs(); if(outputs != null && !outputs.isEmpty()){ ItemStack outputCopy = outputs.get(0).copy(); outputCopy.stackSize = stack.stackSize; item.setEntityItemStack(outputCopy); - tile.storage.extractEnergy(recipe.energyUse, false); + tile.extractEnergy(recipe.energyUse); break; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNoneRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNoneRecipeHandler.java new file mode 100644 index 000000000..4e292ae15 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNoneRecipeHandler.java @@ -0,0 +1,106 @@ +/* + * This file ("LensNoneRecipeHandler.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.items.lens; + +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; + +public class LensNoneRecipeHandler{ + + public static ArrayList mainPageRecipes = new ArrayList(); + public static LensNoneRecipe recipeColorLens; + public static LensNoneRecipe recipeSoulSand; + public static LensNoneRecipe recipeGreenWall; + public static LensNoneRecipe recipeWhiteWall; + public static LensNoneRecipe recipeExplosionLens; + public static LensNoneRecipe recipeDamageLens; + public static LensNoneRecipe recipeLeather; + + public static void init(){ + //Crystal Blocks + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.redstone_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.REDSTONE.ordinal()), 400); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.lapis_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 400); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.diamond_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 600); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.emerald_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.EMERALD.ordinal()), 1000); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.coal_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), 600); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.iron_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 800); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + + //Crystal Items + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.redstone), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 40); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.dye, 1, 4), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 40); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.diamond), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 60); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.emerald), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 100); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 60); + mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.iron_ingot), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 80); + + //Lenses + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new ItemStack(InitItems.itemColorLens), 5000); + recipeColorLens = Util.GetRecipes.lastReconstructorRecipe(); + + if(ConfigCrafting.RECONSTRUCTOR_EXPLOSION_LENS.isEnabled()){ + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemExplosionLens), 5000); + recipeExplosionLens = Util.GetRecipes.lastReconstructorRecipe(); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemExplosionLens), new ItemStack(InitItems.itemDamageLens), 5000); + } + else{ + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemDamageLens), 5000); + } + recipeDamageLens = Util.GetRecipes.lastReconstructorRecipe(); + + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemDamageLens), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), 5000); + + //Misc + if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){ + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.soul_sand), 20000); + recipeSoulSand = Util.GetRecipes.lastReconstructorRecipe(); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(Items.leather), 8000); + recipeLeather = Util.GetRecipes.lastReconstructorRecipe(); + } + + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.quartz_block), new ItemStack(InitBlocks.blockTestifiBucksWhiteWall), 10); + recipeWhiteWall = Util.GetRecipes.lastReconstructorRecipe(); + ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.quartz_block, 1, 1), new ItemStack(InitBlocks.blockTestifiBucksGreenWall), 10); + recipeGreenWall = Util.GetRecipes.lastReconstructorRecipe(); + } + + public static ArrayList getRecipesFor(ItemStack input){ + ArrayList possibleRecipes = new ArrayList(); + for(LensNoneRecipe recipe : ActuallyAdditionsAPI.reconstructorLensNoneRecipes){ + if(ItemUtil.contains(recipe.getInputs(), input, true)){ + possibleRecipes.add(recipe); + } + } + return possibleRecipes; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/lens/Lenses.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/items/lens/Lenses.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java index 6abf5421f..1d4a143fb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/lens/Lenses.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java @@ -8,14 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.lens; +package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.ArrayList; +import de.ellpeck.actuallyadditions.api.lens.Lens; public class Lenses{ - public static ArrayList allLenses = new ArrayList(); - public static final Lens LENS_NONE = new LensNone().register(); public static final Lens LENS_DETONATION = new LensDetonation().register(); public static final Lens LENS_DEATH = new LensDeath().register(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheCrystals.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheCrystals.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java index 82a2f98f8..eb285b9d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheCrystals.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.mod.items.metalists; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.EnumRarity; public enum TheCrystals{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheDusts.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheDusts.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java index f704005eb..da17e1de6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheDusts.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.mod.items.metalists; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.item.EnumRarity; public enum TheDusts{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheFoods.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java index 042219f8f..207170f2a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.mod.items.metalists; -import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.InitItems; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheJams.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java index 87a4d1e62..de4f53f16 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.mod.items.metalists; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java index 174f37290..bcb78228b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.mod.items.metalists; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java index a235b2ec7..a06dfaa3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.items.metalists; +package de.ellpeck.actuallyadditions.mod.items.metalists; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java index 620356212..c55c6bccb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.material; +package de.ellpeck.actuallyadditions.mod.material; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java index 955212256..8df781339 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.material; +package de.ellpeck.actuallyadditions.mod.material; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.Item.ToolMaterial; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/DamageSources.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/misc/DamageSources.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java index 7898ba556..df6e701d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/DamageSources.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerEmptyBucket.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerEmptyBucket.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerEmptyBucket.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerEmptyBucket.java index f27545b9c..0f94d513a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerEmptyBucket.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerEmptyBucket.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerFertilize.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java index 6c1144c4e..ea127b730 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerFillBucket.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFillBucket.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerFillBucket.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFillBucket.java index dfa0d9895..1c270205e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/DispenserHandlerFillBucket.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFillBucket.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/DungeonLoot.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/misc/DungeonLoot.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java index fbf2cb680..6a181d2fb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/DungeonLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/EntityColoredParticleFX.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/misc/EntityColoredParticleFX.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java index accee22ee..3b798cb92 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/EntityColoredParticleFX.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java index 0f7503b9f..f22e75638 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; import cofh.api.energy.IEnergyReceiver; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/misc/WorldData.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java index d84543dfe..b551acbb7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/WorldData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc; +package de.ellpeck.actuallyadditions.mod.misc; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.playerdata.PersistentServerData; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentServerData; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/cloud/ISmileyCloudEasterEgg.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/misc/cloud/ISmileyCloudEasterEgg.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java index 9c1bf6f5f..832b13f30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/cloud/ISmileyCloudEasterEgg.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc.cloud; +package de.ellpeck.actuallyadditions.mod.misc.cloud; public interface ISmileyCloudEasterEgg{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java index 5672cad79..b7176bb7c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc.cloud; +package de.ellpeck.actuallyadditions.mod.misc.cloud; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/special/RenderSpecial.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/misc/special/RenderSpecial.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java index 4a2a70537..4c3d07ec2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/special/RenderSpecial.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc.special; +package de.ellpeck.actuallyadditions.mod.misc.special; -import de.ellpeck.actuallyadditions.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/misc/special/SpecialRenderInit.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java index f025f1bf7..c35584b61 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/special/SpecialRenderInit.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc.special; +package de.ellpeck.actuallyadditions.mod.misc.special; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.util.StringUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/misc/special/ThreadSpecialFetcher.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java index a9a8b51c2..bdc869c50 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.misc.special; +package de.ellpeck.actuallyadditions.mod.misc.special; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import java.io.InputStreamReader; import java.net.URL; diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/INEIRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/nei/INEIRecipeHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java index 5c9af4c0a..d6a3d606b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/INEIRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; public interface INEIRecipeHandler{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java index 4932d6ddc..646910642 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import codechicken.nei.recipe.DefaultOverlayHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.inventory.gui.GuiCrafter; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCrafter; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; public class NEIActuallyAdditionsConfig implements IConfigureNEI{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIBookletRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEIBookletRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java index 182bfd631..b340debe3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIBookletRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java @@ -8,20 +8,20 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.booklet.page.PagePicture; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEICoffeeMachineRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEICoffeeMachineRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java index bb5adcf15..15f0a9b53 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEICoffeeMachineRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java @@ -8,23 +8,26 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.inventory.gui.GuiCoffeeMachine; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemCoffee; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -57,8 +60,8 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEICoffeeMachineRecipe.class){ - ArrayList ingredients = ItemCoffee.ingredients; - for(ItemCoffee.Ingredient ingredient : ingredients){ + List ingredients = ActuallyAdditionsAPI.coffeeMachineIngredients; + for(CoffeeIngredient ingredient : ingredients){ arecipes.add(new CachedCoffee(ingredient)); } } @@ -69,8 +72,8 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE @Override public void loadCraftingRecipes(ItemStack result){ - ArrayList ingredients = ItemCoffee.ingredients; - for(ItemCoffee.Ingredient ingredient : ingredients){ + List ingredients = ActuallyAdditionsAPI.coffeeMachineIngredients; + for(CoffeeIngredient ingredient : ingredients){ if(result.getItem() instanceof ItemCoffee){ arecipes.add(new CachedCoffee(ingredient)); } @@ -80,8 +83,8 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE @Override public void loadUsageRecipes(ItemStack ingredient){ - ArrayList ingredients = ItemCoffee.ingredients; - for(ItemCoffee.Ingredient ingr : ingredients){ + List ingredients = ActuallyAdditionsAPI.coffeeMachineIngredients; + for(CoffeeIngredient ingr : ingredients){ if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()), ingredient) || NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(InitItems.itemCoffeeBean), ingredient) || NEIServerUtils.areStacksSameTypeCrafting(ingr.ingredient.copy(), ingredient)){ CachedCoffee theRecipe = new CachedCoffee(ingr); theRecipe.setIngredientPermutation(Collections.singletonList(theRecipe.ingredientStack), ingredient); @@ -148,7 +151,7 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE public String extraText; public int maxAmp; - public CachedCoffee(ItemCoffee.Ingredient ingredient){ + public CachedCoffee(CoffeeIngredient ingredient){ this.cup = new PositionedStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()), 45, 39); this.coffeeBeans = new PositionedStack(new ItemStack(InitItems.itemCoffeeBean, TileEntityCoffeeMachine.CACHE_USE), 2, 39); this.ingredientStack = new PositionedStack(ingredient.ingredient.copy(), 90, 21); @@ -157,9 +160,9 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE this.maxAmp = ingredient.maxAmplifier; } - public void setupResult(ItemCoffee.Ingredient ingredient){ + public void setupResult(CoffeeIngredient ingredient){ ItemStack result = new ItemStack(InitItems.itemCoffee); - ItemCoffee.addEffectToStack(result, ingredient); + CoffeeBrewing.addEffectToStack(result, ingredient); this.result = new PositionedStack(result.copy(), 45, 70); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEICompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEICompostRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java index fd9334584..5e4703001 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEICompostRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java @@ -8,21 +8,21 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEICrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEICrusherRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java index f2d948f2c..70808e8d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEICrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java @@ -8,20 +8,21 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.inventory.gui.GuiGrinder; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiGrinder; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -50,7 +51,7 @@ public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(this.getBaseName()) && (getClass() == NEICrusherRecipe.class || getClass() == Double.class)){ - for(CrusherRecipeRegistry.CrusherRecipe recipe : CrusherRecipeRegistry.recipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ arecipes.add(new CachedCrush(recipe.getRecipeInputs(), recipe.getRecipeOutputOnes(), recipe.getRecipeOutputTwos(), recipe.outputTwoChance, this)); } } @@ -61,7 +62,7 @@ public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void loadCraftingRecipes(ItemStack result){ - for(CrusherRecipeRegistry.CrusherRecipe recipe : CrusherRecipeRegistry.recipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ if(ItemUtil.contains(recipe.getRecipeOutputOnes(), result, true) || ItemUtil.contains(recipe.getRecipeOutputTwos(), result, true)){ arecipes.add(new CachedCrush(recipe.getRecipeInputs(), recipe.getRecipeOutputOnes(), recipe.getRecipeOutputTwos(), recipe.outputTwoChance, this)); } @@ -70,7 +71,7 @@ public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecip @Override public void loadUsageRecipes(ItemStack ingredient){ - for(CrusherRecipeRegistry.CrusherRecipe recipe : CrusherRecipeRegistry.recipes){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ if(ItemUtil.contains(recipe.getRecipeInputs(), ingredient, true)){ CachedCrush theRecipe = new CachedCrush(recipe.getRecipeInputs(), recipe.getRecipeOutputOnes(), recipe.getRecipeOutputTwos(), recipe.outputTwoChance, this); theRecipe.setIngredientPermutation(Collections.singletonList(theRecipe.ingredient), ingredient); diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIFurnaceDoubleRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEIFurnaceDoubleRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java index fc41a3105..00be8ff66 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIFurnaceDoubleRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java @@ -8,19 +8,19 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.inventory.gui.GuiFurnaceDouble; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIHairyBallRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java similarity index 73% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEIHairyBallRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java index 42f4b046c..921c84288 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIHairyBallRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java @@ -8,26 +8,27 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.recipe.HairyBallHandler; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import java.awt.*; -import java.util.ArrayList; import java.util.Collections; +import java.util.List; public class NEIHairyBallRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ @@ -56,9 +57,9 @@ public class NEIHairyBallRecipe extends TemplateRecipeHandler implements INEIRec @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEIHairyBallRecipe.class){ - ArrayList recipes = HairyBallHandler.returns; - for(HairyBallHandler.Return recipe : recipes){ - arecipes.add(new CachedBallRecipe(recipe.inputItem, recipe.returnItem, recipe.itemWeight)); + List recipes = ActuallyAdditionsAPI.ballOfFurReturnItems; + for(BallOfFurReturn recipe : recipes){ + arecipes.add(new CachedBallRecipe(new ItemStack(InitItems.itemHairyBall), recipe.returnItem, recipe.itemWeight)); } } else{ @@ -68,20 +69,21 @@ public class NEIHairyBallRecipe extends TemplateRecipeHandler implements INEIRec @Override public void loadCraftingRecipes(ItemStack result){ - ArrayList recipes = HairyBallHandler.returns; - for(HairyBallHandler.Return recipe : recipes){ + List recipes = ActuallyAdditionsAPI.ballOfFurReturnItems; + for(BallOfFurReturn recipe : recipes){ if(NEIServerUtils.areStacksSameType(recipe.returnItem, result)){ - arecipes.add(new CachedBallRecipe(recipe.inputItem, recipe.returnItem, recipe.itemWeight)); + arecipes.add(new CachedBallRecipe(new ItemStack(InitItems.itemHairyBall), recipe.returnItem, recipe.itemWeight)); } } } @Override public void loadUsageRecipes(ItemStack ingredient){ - ArrayList recipes = HairyBallHandler.returns; - for(HairyBallHandler.Return recipe : recipes){ - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.inputItem, ingredient)){ - CachedBallRecipe theRecipe = new CachedBallRecipe(recipe.inputItem, recipe.returnItem, recipe.itemWeight); + List recipes = ActuallyAdditionsAPI.ballOfFurReturnItems; + for(BallOfFurReturn recipe : recipes){ + ItemStack stack = new ItemStack(InitItems.itemHairyBall); + if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)){ + CachedBallRecipe theRecipe = new CachedBallRecipe(stack, recipe.returnItem, recipe.itemWeight); theRecipe.setIngredientPermutation(Collections.singletonList(theRecipe.input), ingredient); arecipes.add(theRecipe); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java index 3ad61703e..fcc9295cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java @@ -8,19 +8,20 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.lens.LensColor; -import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler; -import de.ellpeck.actuallyadditions.util.*; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.lens.LensColor; +import de.ellpeck.actuallyadditions.mod.util.*; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; @@ -60,9 +61,9 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEIReconstructorRecipe.class){ + List recipes = ActuallyAdditionsAPI.reconstructorLensNoneRecipes; //Default Recipes - ArrayList recipes = LensNoneRecipeHandler.recipes; - for(LensNoneRecipeHandler.Recipe recipe : recipes){ + for(LensNoneRecipe recipe : recipes){ arecipes.add(new CachedReconstructorRecipe(recipe, false)); } //Color Recipes @@ -78,7 +79,7 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE ItemStack stackCopy = stack.copy(); stackCopy.setItemDamage(i >= 15 ? 0 : i+1); stack.setItemDamage(i); - arecipes.add(new CachedReconstructorRecipe(new LensNoneRecipeHandler.Recipe(stack, stackCopy, LensColor.ENERGY_USE), true)); + arecipes.add(new CachedReconstructorRecipe(new LensNoneRecipe(stack, stackCopy, LensColor.ENERGY_USE), true)); } } } @@ -89,9 +90,9 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE @Override public void loadCraftingRecipes(ItemStack result){ - ArrayList recipes = LensNoneRecipeHandler.recipes; + List recipes = ActuallyAdditionsAPI.reconstructorLensNoneRecipes; //Default Recipes - for(LensNoneRecipeHandler.Recipe recipe : recipes){ + for(LensNoneRecipe recipe : recipes){ if(ItemUtil.contains(recipe.getOutputs(), result, true)){ arecipes.add(new CachedReconstructorRecipe(recipe, false)); } @@ -101,15 +102,15 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE int meta = result.getItemDamage(); ItemStack input = result.copy(); input.setItemDamage(meta <= 0 ? 15 : meta-1); - arecipes.add(new CachedReconstructorRecipe(new LensNoneRecipeHandler.Recipe(input, result, LensColor.ENERGY_USE), true)); + arecipes.add(new CachedReconstructorRecipe(new LensNoneRecipe(input, result, LensColor.ENERGY_USE), true)); } } @Override public void loadUsageRecipes(ItemStack ingredient){ - ArrayList recipes = LensNoneRecipeHandler.recipes; + List recipes = ActuallyAdditionsAPI.reconstructorLensNoneRecipes; //Default Recipes - for(LensNoneRecipeHandler.Recipe recipe : recipes){ + for(LensNoneRecipe recipe : recipes){ if(ItemUtil.contains(recipe.getInputs(), ingredient, true)){ CachedReconstructorRecipe theRecipe = new CachedReconstructorRecipe(recipe, false); theRecipe.setIngredientPermutation(Collections.singletonList(theRecipe.input), ingredient); @@ -121,7 +122,7 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE int meta = ingredient.getItemDamage(); ItemStack output = ingredient.copy(); output.setItemDamage(meta >= 15 ? 0 : meta+1); - arecipes.add(new CachedReconstructorRecipe(new LensNoneRecipeHandler.Recipe(ingredient, output, LensColor.ENERGY_USE), true)); + arecipes.add(new CachedReconstructorRecipe(new LensNoneRecipe(ingredient, output, LensColor.ENERGY_USE), true)); } } @@ -169,7 +170,7 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE public PositionedStack input; public boolean showColorLens; - public CachedReconstructorRecipe(LensNoneRecipeHandler.Recipe recipe, boolean showColorLens){ + public CachedReconstructorRecipe(LensNoneRecipe recipe, boolean showColorLens){ this.result = new PositionedStack(recipe.getOutputs(), 67+32, 19); this.input = new PositionedStack(recipe.getInputs(), 5+32, 19); this.showColorLens = showColorLens; diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIScreenEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEIScreenEvents.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java index 850cf0175..93026d8b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEIScreenEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.IRecipeHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.booklet.button.TexturedButton; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.GuiScreenEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/nei/NEITreasureChestRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java similarity index 72% rename from src/main/java/de/ellpeck/actuallyadditions/nei/NEITreasureChestRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java index fe5aaec40..d1c63af71 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/nei/NEITreasureChestRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java @@ -8,26 +8,27 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.nei; +package de.ellpeck.actuallyadditions.mod.nei; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.recipe.TreasureChestHandler; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import java.awt.*; -import java.util.ArrayList; import java.util.Collections; +import java.util.List; public class NEITreasureChestRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ @@ -56,9 +57,9 @@ public class NEITreasureChestRecipe extends TemplateRecipeHandler implements INE @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == NEITreasureChestRecipe.class){ - ArrayList recipes = TreasureChestHandler.returns; - for(TreasureChestHandler.Return recipe : recipes){ - arecipes.add(new CachedTreasure(recipe.input, recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount)); + List recipes = ActuallyAdditionsAPI.treasureChestLoot; + for(TreasureChestLoot recipe : recipes){ + arecipes.add(new CachedTreasure(new ItemStack(InitBlocks.blockTreasureChest), recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount)); } } else{ @@ -68,20 +69,21 @@ public class NEITreasureChestRecipe extends TemplateRecipeHandler implements INE @Override public void loadCraftingRecipes(ItemStack result){ - ArrayList recipes = TreasureChestHandler.returns; - for(TreasureChestHandler.Return recipe : recipes){ + List recipes = ActuallyAdditionsAPI.treasureChestLoot; + for(TreasureChestLoot recipe : recipes){ if(NEIServerUtils.areStacksSameType(recipe.returnItem, result)){ - arecipes.add(new CachedTreasure(recipe.input, recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount)); + arecipes.add(new CachedTreasure(new ItemStack(InitBlocks.blockTreasureChest), recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount)); } } } @Override public void loadUsageRecipes(ItemStack ingredient){ - ArrayList recipes = TreasureChestHandler.returns; - for(TreasureChestHandler.Return recipe : recipes){ - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.input, ingredient)){ - CachedTreasure theRecipe = new CachedTreasure(recipe.input, recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount); + List recipes = ActuallyAdditionsAPI.treasureChestLoot; + for(TreasureChestLoot recipe : recipes){ + ItemStack stack = new ItemStack(InitBlocks.blockTreasureChest); + if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)){ + CachedTreasure theRecipe = new CachedTreasure(stack, recipe.returnItem, recipe.itemWeight, recipe.minAmount, recipe.maxAmount); theRecipe.setIngredientPermutation(Collections.singletonList(theRecipe.input), ingredient); arecipes.add(theRecipe); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/PacketBookletStandButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/network/PacketBookletStandButton.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java index 247574804..22f0e00d4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/PacketBookletStandButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.mod.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import de.ellpeck.actuallyadditions.booklet.EntrySet; -import de.ellpeck.actuallyadditions.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.tile.TileEntityBookletStand; +import de.ellpeck.actuallyadditions.mod.booklet.EntrySet; +import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/PacketHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/network/PacketHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java index 03fb2648a..f682126b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/PacketHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.mod.network; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiButton; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiNumber; -import de.ellpeck.actuallyadditions.network.gui.PacketGuiString; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiButton; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiNumber; +import de.ellpeck.actuallyadditions.mod.network.gui.PacketGuiString; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; public class PacketHandler{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/PacketParticle.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/network/PacketParticle.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java index 68f4d60b2..696bbb27c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/PacketParticle.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.mod.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.misc.EntityColoredParticleFX; +import de.ellpeck.actuallyadditions.mod.misc.EntityColoredParticleFX; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.util.Vec3; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/VanillaPacketSyncer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/VanillaPacketSyncer.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/network/VanillaPacketSyncer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/VanillaPacketSyncer.java index 5d139c11c..095032a93 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/VanillaPacketSyncer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/VanillaPacketSyncer.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network; +package de.ellpeck.actuallyadditions.mod.network; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/gui/IButtonReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/network/gui/IButtonReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java index 286b660dc..3e46569b8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/gui/IButtonReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.mod.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/gui/INumberReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/network/gui/INumberReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java index d20cb3707..93fb7f525 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/gui/INumberReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.mod.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/gui/IStringReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/network/gui/IStringReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java index 3db2e7d0a..f3e6c9fc9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/gui/IStringReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.mod.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiButton.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java index e6ef8bbfa..e300aa37c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.mod.network.gui; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiNumber.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiNumber.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java index d9ec534a4..ed52de8f0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiNumber.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.mod.network.gui; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiString.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiString.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java index 28b905048..504ceb8af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/network/gui/PacketGuiString.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.network.gui; +package de.ellpeck.actuallyadditions.mod.network.gui; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java index 37d2263e8..ac79e6366 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.ore; +package de.ellpeck.actuallyadditions.mod.ore; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/proxy/ClientProxy.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index edef84767..b996e177d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.proxy; +package de.ellpeck.actuallyadditions.mod.proxy; import cpw.mods.fml.client.registry.ClientRegistry; @@ -17,16 +17,16 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.VillagerRegistry; -import de.ellpeck.actuallyadditions.blocks.render.*; -import de.ellpeck.actuallyadditions.blocks.render.model.*; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.event.InitEvents; -import de.ellpeck.actuallyadditions.misc.special.SpecialRenderInit; -import de.ellpeck.actuallyadditions.tile.*; -import de.ellpeck.actuallyadditions.util.AssetUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.playerdata.PersistentClientData; +import de.ellpeck.actuallyadditions.mod.blocks.render.*; +import de.ellpeck.actuallyadditions.mod.blocks.render.model.*; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.event.InitEvents; +import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; +import de.ellpeck.actuallyadditions.mod.tile.*; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/proxy/IProxy.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java index 38e94a6f1..9a78e2dc7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.proxy; +package de.ellpeck.actuallyadditions.mod.proxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/proxy/ServerProxy.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java index c19fd1125..280201a4a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.proxy; +package de.ellpeck.actuallyadditions.mod.proxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; @SuppressWarnings("unused") public class ServerProxy implements IProxy{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java new file mode 100644 index 000000000..1c26d7e77 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java @@ -0,0 +1,124 @@ +/* + * This file ("CrusherRecipeRegistry.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.recipe; + +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.List; + + +public class CrusherRecipeRegistry{ + + public static ArrayList searchCases = new ArrayList(); + + public static void registerFinally(){ + ArrayList oresNoResult = new ArrayList(); + int recipeStartedAt = ActuallyAdditionsAPI.crusherRecipes.size(); + + for(String ore : OreDictionary.getOreNames()){ + if(!hasException(ore)){ + for(SearchCase theCase : searchCases){ + if(ore.length() > theCase.theCase.length()){ + if(ore.substring(0, theCase.theCase.length()).equals(theCase.theCase)){ + String output = theCase.resultPreString+ore.substring(theCase.theCase.length()); + + if(!hasOreRecipe(ore)){ + if(!OreDictionary.getOres(output, false).isEmpty() && !OreDictionary.getOres(ore, false).isEmpty()){ + ActuallyAdditionsAPI.addCrusherRecipe(ore, output, theCase.resultAmount); + } + else{ + oresNoResult.add(ore); + } + } + + break; + } + } + } + } + } + + ArrayList addedRecipes = new ArrayList(); + for(int i = recipeStartedAt; i < ActuallyAdditionsAPI.crusherRecipes.size(); i++){ + CrusherRecipe recipe = ActuallyAdditionsAPI.crusherRecipes.get(i); + addedRecipes.add(recipe.input+" -> "+recipe.outputOneAmount+"x "+recipe.outputOne); + } + ModUtil.LOGGER.info("Added "+addedRecipes.size()+" Crusher Recipes automatically: "+addedRecipes.toString()); + ModUtil.LOGGER.warn("Couldn't add "+oresNoResult.size()+" Crusher Recipes automatically because the inputs were missing outputs: "+oresNoResult.toString()); + } + + private static boolean hasException(String ore){ + for(String conf : ConfigValues.crusherRecipeExceptions){ + if(conf.equals(ore)){ + return true; + } + } + return false; + } + + public static boolean hasOreRecipe(String input){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + if(recipe.input != null && recipe.input.equals(input)){ + return true; + } + } + return false; + } + + public static List getOutputOnes(ItemStack input){ + CrusherRecipe recipe = getRecipeFromInput(input); + return recipe == null ? null : recipe.getRecipeOutputOnes(); + } + + public static CrusherRecipe getRecipeFromInput(ItemStack input){ + for(CrusherRecipe recipe : ActuallyAdditionsAPI.crusherRecipes){ + if(ItemUtil.contains(recipe.getRecipeInputs(), input, true)){ + return recipe; + } + } + return null; + } + + public static List getOutputTwos(ItemStack input){ + CrusherRecipe recipe = getRecipeFromInput(input); + return recipe == null ? null : recipe.getRecipeOutputTwos(); + } + + public static int getOutputTwoChance(ItemStack input){ + CrusherRecipe recipe = getRecipeFromInput(input); + return recipe == null ? -1 : recipe.outputTwoChance; + } + + public static class SearchCase{ + + String theCase; + int resultAmount; + String resultPreString; + + public SearchCase(String theCase, int resultAmount){ + this(theCase, resultAmount, "dust"); + } + + public SearchCase(String theCase, int resultAmount, String resultPreString){ + this.theCase = theCase; + this.resultAmount = resultAmount; + this.resultPreString = resultPreString; + } + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipe/FuelHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/recipe/FuelHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java index 84a21f747..69cb9d1ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/recipe/FuelHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.recipe; +package de.ellpeck.actuallyadditions.mod.recipe; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java new file mode 100644 index 000000000..3f43cfaa0 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java @@ -0,0 +1,48 @@ +/* + * This file ("HairyBallHandler.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.recipe; + +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +public class HairyBallHandler{ + + public static void init(){ + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.string), 100); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.diamond), 2); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.name_tag), 1); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.fish), 80); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.fish, 1, 1), 60); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.fish, 1, 2), 10); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.fish, 1, 3), 40); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.feather), 60); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.leather), 30); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.dye), 70); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.clay_ball), 40); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.stick), 40); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.iron_ingot), 10); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.gold_ingot), 6); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.beef), 30); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.ender_pearl), 2); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Blocks.planks), 20); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Blocks.waterlily), 10); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Items.experience_bottle), 3); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Blocks.gravel), 40); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Blocks.sand), 50); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Blocks.vine), 30); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(Blocks.web), 4); + ActuallyAdditionsAPI.addBallOfFurReturnItem(new ItemStack(InitItems.itemSolidifiedExperience), 20); + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java new file mode 100644 index 000000000..aa365c338 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java @@ -0,0 +1,56 @@ +/* + * This file ("TreasureChestHandler.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense/ + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2016 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.recipe; + +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +public class TreasureChestHandler{ + + public static void init(){ + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.diamond), 5, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.iron_ingot), 30, 1, 5); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.gold_nugget), 60, 1, 8); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.gold_ingot), 35, 1, 3); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.ender_pearl), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.emerald), 3, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.experience_bottle), 5, 3, 6); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemSolidifiedExperience), 15, 3, 6); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_11), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_13), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_blocks), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_cat), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_chirp), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_far), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_mall), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_mellohi), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_stal), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_strad), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_ward), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.record_wait), 1, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.saddle), 5, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.name_tag), 20, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.CU_BA_RA.ordinal()), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.GRA_KI_BA.ordinal()), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.PL_AP_LE.ordinal()), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.CH_AP_CI.ordinal()), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.HO_ME_KI.ordinal()), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.PI_CO.ordinal()), 10, 1, 2); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.fish), 80, 1, 3); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.fish, 1, 1), 60, 1, 3); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.fish, 1, 2), 10, 1, 1); + ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.fish, 1, 3), 40, 1, 2); + } + +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/IEnergySaver.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/tile/IEnergySaver.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java index b8e413836..c6f432f56 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/IEnergySaver.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; public interface IEnergySaver{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/IFluidSaver.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/tile/IFluidSaver.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java index 5cd26ae57..f6ac5393b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/IFluidSaver.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/IRedstoneToggle.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/tile/IRedstoneToggle.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java index a36aa9360..ca5712b50 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/IRedstoneToggle.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; public interface IRedstoneToggle{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java index 323b685f7..e31e4c960 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java @@ -8,26 +8,28 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.lens.ItemLens; -import de.ellpeck.actuallyadditions.items.lens.Lens; -import de.ellpeck.actuallyadditions.items.lens.Lenses; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.PacketParticle; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor; +import de.ellpeck.actuallyadditions.api.lens.ILensItem; +import de.ellpeck.actuallyadditions.api.lens.Lens; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.PacketParticle; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityAtomicReconstructor extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver, IRedstoneToggle, IEnergyDisplay{ +public class TileEntityAtomicReconstructor extends TileEntityInventoryBase implements IEnergyReceiver, IEnergySaver, IRedstoneToggle, IEnergyDisplay, IAtomicReconstructor{ public static final int ENERGY_USE = 1000; public EnergyStorage storage = new EnergyStorage(300000); @@ -88,8 +90,8 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple public Lens getCurrentLens(){ if(this.slots[0] != null){ - if(this.slots[0].getItem() instanceof ItemLens){ - return ((ItemLens)this.slots[0].getItem()).getLensType(); + if(this.slots[0].getItem() instanceof ILensItem){ + return ((ILensItem)this.slots[0].getItem()).getLens(); } } return Lenses.LENS_NONE; @@ -158,7 +160,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple @Override public boolean isItemValidForSlot(int i, ItemStack stack){ - return stack != null && stack.getItem() instanceof ItemLens; + return stack != null && stack.getItem() instanceof ILensItem; } @Override @@ -166,6 +168,26 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple return true; } + @Override + public int getX(){ + return this.xCoord; + } + + @Override + public int getY(){ + return this.yCoord; + } + + @Override + public int getZ(){ + return this.zCoord; + } + + @Override + public void extractEnergy(int amount){ + this.storage.extractEnergy(amount, false); + } + @Override public int getEnergy(){ return this.storage.getEnergyStored(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index afa1cba1c..24ac027f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.common.registry.GameRegistry; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.network.VanillaPacketSyncer; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.network.VanillaPacketSyncer; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBookletStand.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBookletStand.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBookletStand.java index c658ca0fe..f22769886 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBookletStand.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.booklet.EntrySet; +import de.ellpeck.actuallyadditions.mod.booklet.EntrySet; import net.minecraft.nbt.NBTTagCompound; public class TileEntityBookletStand extends TileEntityBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java index bf3aebe4d..e68f3a132 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index 553ea6873..642e82d4a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index 8c18e92f7..c7abc6359 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index 422eb6acb..474a2bd48 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -8,18 +8,19 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemCoffee; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -138,7 +139,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements ItemStack output = new ItemStack(InitItems.itemCoffee); for(int i = 3; i < this.slots.length-2; i++){ if(this.slots[i] != null){ - ItemCoffee.Ingredient ingredient = ItemCoffee.getIngredientFromStack(this.slots[i]); + CoffeeIngredient ingredient = ItemCoffee.getIngredientFromStack(this.slots[i]); if(ingredient != null){ if(ingredient.effect(output)){ this.slots[i].stackSize--; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCompost.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java index e74f62cf5..f4c8d39bf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemFertilizer; -import de.ellpeck.actuallyadditions.items.ItemMisc; -import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemFertilizer; +import de.ellpeck.actuallyadditions.mod.items.ItemMisc; +import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index d37e8299a..a9ea0224c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java index ce014e1dd..aebd29557 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java index 3570f54db..5fa0a8159 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyContainerItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityEnervator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java index 3d767af7a..6246344b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java index 76aaf047e..94d752215 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index 2475c7f47..70c06465e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java index a7280ffc1..c5a9c907e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -8,13 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.init.Items; import net.minecraft.item.ItemDye; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java index 83910ce95..7d72f3bd3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java index 4a8128b9d..881c2ce01 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java index 7ba46e010..23bdef8b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java index 3addacbbc..06c3fa650 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java @@ -8,13 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java index 043d0a7bf..6f7e18b23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java index 18357f027..f2afc4700 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; import net.minecraft.block.IGrowable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java index be81d5f42..34aeaca9e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java @@ -8,16 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java index 824477e1f..1c1855a72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java @@ -8,15 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java index f31465510..0551560f6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.network.gui.INumberReactor; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java index bd517af9a..cdb9d390c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java index cf790df5d..a9b99ca18 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java index ac7769f91..f66135ba7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java @@ -8,18 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.misc.LaserRelayConnectionHandler; -import de.ellpeck.actuallyadditions.network.PacketParticle; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; +import de.ellpeck.actuallyadditions.mod.network.PacketParticle; +import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java index fe24879f6..42a07c10a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java @@ -8,15 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java index c209f85b1..edba85251 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java @@ -8,17 +8,18 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.PacketParticle; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.PacketParticle; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java index b4541de6a..bef5ae9cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java @@ -8,18 +8,19 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.network.PacketHandler; -import de.ellpeck.actuallyadditions.network.PacketParticle; -import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.mod.config.ConfigValues; +import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +import de.ellpeck.actuallyadditions.mod.network.PacketParticle; +import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java index 58dfe8fde..c34d821b9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java @@ -8,14 +8,14 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomBooster.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java index fb3298209..d396a4a94 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; public class TileEntityPhantomBooster extends TileEntityBase{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomEnergyface.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java index 9c4006a5a..f29374bdf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomEnergyface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java @@ -8,13 +8,13 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -import de.ellpeck.actuallyadditions.blocks.BlockPhantom; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomItemface.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java index 0cde788de..4c3ab6849 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomItemface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomLiquiface.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java index 712a3dbd9..21475cf5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.blocks.BlockPhantom; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java index 318cff779..50eba8341 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java @@ -8,15 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.network.PacketParticle; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; +import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.mod.network.PacketParticle; +import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java index daecb17eb..869af8fb0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -8,15 +8,16 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.blocks.BlockPhantom; -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.network.PacketParticle; -import de.ellpeck.actuallyadditions.util.Position; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.api.Position; +import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; +import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.mod.network.PacketParticle; +import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java index df4fc05df..77417bfcc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.util.WorldUtil; +import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java index 9376e201b..a1ebe1825 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.network.gui.IStringReactor; +import de.ellpeck.actuallyadditions.mod.network.gui.IStringReactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java index 8424f7754..a61a7a41d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.tile; +package de.ellpeck.actuallyadditions.mod.tile; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.ItemSolidifiedExperience; -import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.mod.items.ItemSolidifiedExperience; +import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java index 23f50c329..f82eab39c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java @@ -8,9 +8,9 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.update; +package de.ellpeck.actuallyadditions.mod.update; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/main/java/de/ellpeck/actuallyadditions/update/UpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/update/UpdateChecker.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java index 4fbee20aa..046bcaca7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/update/UpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.update; +package de.ellpeck.actuallyadditions.mod.update; -import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; public class UpdateChecker{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/update/UpdateCheckerClientNotificationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/update/UpdateCheckerClientNotificationEvent.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java index fa5de1d38..5b321bbe9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/update/UpdateCheckerClientNotificationEvent.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java @@ -8,12 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.update; +package de.ellpeck.actuallyadditions.mod.update; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; -import de.ellpeck.actuallyadditions.util.ModUtil; -import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IChatComponent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/util/AssetUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 78fabe65c..8ce53337a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -8,11 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/CompatUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/util/CompatUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java index 58eed5dd9..b3628afc9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/CompatUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java @@ -8,10 +8,10 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import cpw.mods.fml.common.event.FMLInterModComms; -import de.ellpeck.actuallyadditions.items.ItemSeed; +import de.ellpeck.actuallyadditions.mod.items.ItemSeed; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/FakePlayerUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/util/FakePlayerUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java index c729c1e84..cf56da7b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/FakePlayerUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import com.mojang.authlib.GameProfile; import net.minecraft.world.World; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/ItemUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/util/ItemUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java index 1a3445a1f..8b799f6c4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/ItemUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/KeyUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/util/KeyUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java index 6c90eb7d4..171bfe554 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/KeyUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/KeyUtil.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/ModUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/util/ModUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java index ee18fca56..e9b99040f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/ModUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/StringUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/util/StringUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java index 4847e84c9..1086099db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/StringUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.StatCollector; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/util/Util.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index 8c0def6ba..119674142 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -8,11 +8,12 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import cpw.mods.fml.common.FMLCommonHandler; -import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler; -import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; +import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.item.EnumRarity; @@ -24,7 +25,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -78,13 +78,13 @@ public class Util{ public static class GetRecipes{ - public static LensNoneRecipeHandler.Recipe lastReconstructorRecipe(){ - ArrayList list = LensNoneRecipeHandler.recipes; + public static LensNoneRecipe lastReconstructorRecipe(){ + List list = ActuallyAdditionsAPI.reconstructorLensNoneRecipes; return list.get(list.size()-1); } - public static CrusherRecipeRegistry.CrusherRecipe lastCrusherRecipe(){ - ArrayList list = CrusherRecipeRegistry.recipes; + public static CrusherRecipe lastCrusherRecipe(){ + List list = ActuallyAdditionsAPI.crusherRecipes; return list.get(list.size()-1); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/util/WorldUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index 4982920b5..3cbf8c8df 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -8,10 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util; +package de.ellpeck.actuallyadditions.mod.util; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; +import de.ellpeck.actuallyadditions.api.Position; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/playerdata/PersistentClientData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/util/playerdata/PersistentClientData.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java index 8df0cadb4..668a951e0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/playerdata/PersistentClientData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java @@ -8,15 +8,15 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util.playerdata; +package de.ellpeck.actuallyadditions.mod.util.playerdata; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import de.ellpeck.actuallyadditions.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.booklet.EntrySet; -import de.ellpeck.actuallyadditions.booklet.GuiBooklet; -import de.ellpeck.actuallyadditions.booklet.button.BookmarkButton; -import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; +import de.ellpeck.actuallyadditions.mod.booklet.EntrySet; +import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/util/playerdata/PersistentServerData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/util/playerdata/PersistentServerData.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java index bac03532f..80bcb3501 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/util/playerdata/PersistentServerData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.util.playerdata; +package de.ellpeck.actuallyadditions.mod.util.playerdata; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java deleted file mode 100644 index d62cdfabe..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java +++ /dev/null @@ -1,255 +0,0 @@ -/* - * This file ("CrusherRecipeRegistry.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.recipe; - -import de.ellpeck.actuallyadditions.config.ConfigValues; -import de.ellpeck.actuallyadditions.util.ItemUtil; -import de.ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - - -public class CrusherRecipeRegistry{ - - public static ArrayList recipes = new ArrayList(); - public static ArrayList searchCases = new ArrayList(); - - public static void registerFinally(){ - ArrayList oresNoResult = new ArrayList(); - int recipeStartedAt = recipes.size(); - - for(String ore : OreDictionary.getOreNames()){ - if(!hasException(ore)){ - for(SearchCase theCase : searchCases){ - if(ore.length() > theCase.theCase.length()){ - if(ore.substring(0, theCase.theCase.length()).equals(theCase.theCase)){ - String output = theCase.resultPreString+ore.substring(theCase.theCase.length()); - - if(!hasOreRecipe(ore)){ - if(!OreDictionary.getOres(output, false).isEmpty() && !OreDictionary.getOres(ore, false).isEmpty()){ - addRecipe(ore, output, theCase.resultAmount); - } - else{ - oresNoResult.add(ore); - } - } - - break; - } - } - } - } - } - - ArrayList addedRecipes = new ArrayList(); - for(int i = recipeStartedAt; i < recipes.size(); i++){ - CrusherRecipe recipe = recipes.get(i); - addedRecipes.add(recipe.input+" -> "+recipe.outputOneAmount+"x "+recipe.outputOne); - } - ModUtil.LOGGER.info("Added "+addedRecipes.size()+" Crusher Recipes automatically: "+addedRecipes.toString()); - ModUtil.LOGGER.warn("Couldn't add "+oresNoResult.size()+" Crusher Recipes automatically because the inputs were missing outputs: "+oresNoResult.toString()); - } - - private static boolean hasException(String ore){ - for(String conf : ConfigValues.crusherRecipeExceptions){ - if(conf.equals(ore)){ - return true; - } - } - return false; - } - - public static boolean hasOreRecipe(String input){ - for(CrusherRecipe recipe : recipes){ - if(recipe.input != null && recipe.input.equals(input)){ - return true; - } - } - return false; - } - - public static void addRecipe(String input, String outputOne, int outputOneAmount){ - addRecipe(input, outputOne, outputOneAmount, "", 0, 0); - } - - public static void addRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){ - if(!OreDictionary.getOres(input, false).isEmpty() && !OreDictionary.getOres(outputOne, false).isEmpty() && (outputTwo == null || outputTwo.isEmpty() || !OreDictionary.getOres(outputTwo, false).isEmpty())){ - recipes.add(new CrusherRecipe(input, outputOne, outputOneAmount, outputTwo, outputTwoAmount, outputTwoChance)); - } - } - - public static void addRecipe(ItemStack input, ItemStack outputOne){ - addRecipe(input, outputOne, null, 0); - } - - public static void addRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){ - recipes.add(new CrusherRecipe(input, outputOne, outputTwo, outputTwoChance)); - } - - public static void addRecipe(ItemStack input, String outputOne, int outputOneAmount){ - if(!OreDictionary.getOres(outputOne, false).isEmpty()){ - recipes.add(new CrusherRecipe(input, outputOne, outputOneAmount)); - } - } - - public static List getOutputOnes(ItemStack input){ - CrusherRecipe recipe = getRecipeFromInput(input); - return recipe == null ? null : recipe.getRecipeOutputOnes(); - } - - public static CrusherRecipe getRecipeFromInput(ItemStack input){ - for(CrusherRecipe recipe : recipes){ - if(ItemUtil.contains(recipe.getRecipeInputs(), input, true)){ - return recipe; - } - } - return null; - } - - public static List getOutputTwos(ItemStack input){ - CrusherRecipe recipe = getRecipeFromInput(input); - return recipe == null ? null : recipe.getRecipeOutputTwos(); - } - - public static int getOutputTwoChance(ItemStack input){ - CrusherRecipe recipe = getRecipeFromInput(input); - return recipe == null ? -1 : recipe.outputTwoChance; - } - - public static class CrusherRecipe{ - - public int outputTwoChance; - private String input; - private String outputOne; - private int outputOneAmount; - private String outputTwo; - private int outputTwoAmount; - private ItemStack inputStack; - private ItemStack outputOneStack; - private ItemStack outputTwoStack; - - public CrusherRecipe(ItemStack input, String outputOne, int outputOneAmount){ - this.inputStack = input; - this.outputOne = outputOne; - this.outputOneAmount = outputOneAmount; - } - - public CrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){ - this.inputStack = input; - this.outputOneStack = outputOne; - this.outputTwoStack = outputTwo; - this.outputTwoChance = outputTwoChance; - } - - public CrusherRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){ - this.input = input; - this.outputOne = outputOne; - this.outputOneAmount = outputOneAmount; - this.outputTwo = outputTwo; - this.outputTwoAmount = outputTwoAmount; - this.outputTwoChance = outputTwoChance; - } - - public List getRecipeOutputOnes(){ - if(this.outputOneStack != null){ - return Collections.singletonList(this.outputOneStack.copy()); - } - - if(this.outputOne == null || this.outputOne.isEmpty()){ - return null; - } - - List stacks = OreDictionary.getOres(this.outputOne, false); - if(stacks != null && !stacks.isEmpty()){ - List stacksCopy = new ArrayList(); - for(ItemStack stack : stacks){ - if(stack != null){ - ItemStack stackCopy = stack.copy(); - stackCopy.stackSize = this.outputOneAmount; - stacksCopy.add(stackCopy); - } - } - return stacksCopy; - } - return null; - } - - public List getRecipeOutputTwos(){ - if(this.outputTwoStack != null){ - return Collections.singletonList(this.outputTwoStack.copy()); - } - - if(this.outputTwo == null || this.outputTwo.isEmpty()){ - return null; - } - - List stacks = OreDictionary.getOres(this.outputTwo, false); - if(stacks != null && !stacks.isEmpty()){ - List stacksCopy = new ArrayList(); - for(ItemStack stack : stacks){ - if(stack != null){ - ItemStack stackCopy = stack.copy(); - stackCopy.stackSize = this.outputTwoAmount; - stacksCopy.add(stackCopy); - } - } - return stacksCopy; - } - return null; - } - - public List getRecipeInputs(){ - if(this.inputStack != null){ - return Collections.singletonList(this.inputStack.copy()); - } - - if(this.input == null || this.input.isEmpty()){ - return null; - } - - List stacks = OreDictionary.getOres(this.input, false); - if(stacks != null && !stacks.isEmpty()){ - List stacksCopy = new ArrayList(); - for(ItemStack stack : stacks){ - if(stack != null){ - ItemStack stackCopy = stack.copy(); - stackCopy.stackSize = 1; - stacksCopy.add(stackCopy); - } - } - return stacksCopy; - } - return null; - } - } - - public static class SearchCase{ - - String theCase; - int resultAmount; - String resultPreString; - - public SearchCase(String theCase, int resultAmount){ - this(theCase, resultAmount, "dust"); - } - - public SearchCase(String theCase, int resultAmount, String resultPreString){ - this.theCase = theCase; - this.resultAmount = resultAmount; - this.resultPreString = resultPreString; - } - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipe/HairyBallHandler.java b/src/main/java/de/ellpeck/actuallyadditions/recipe/HairyBallHandler.java deleted file mode 100644 index 522aa5997..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/recipe/HairyBallHandler.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file ("HairyBallHandler.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.recipe; - -import de.ellpeck.actuallyadditions.items.InitItems; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - -import java.util.ArrayList; - -public class HairyBallHandler{ - - public static ArrayList returns = new ArrayList(); - - public static void init(){ - addReturn(new ItemStack(Items.string), 100); - addReturn(new ItemStack(Items.diamond), 2); - addReturn(new ItemStack(Items.name_tag), 1); - addReturn(new ItemStack(Items.fish), 80); - addReturn(new ItemStack(Items.fish, 1, 1), 60); - addReturn(new ItemStack(Items.fish, 1, 2), 10); - addReturn(new ItemStack(Items.fish, 1, 3), 40); - addReturn(new ItemStack(Items.feather), 60); - addReturn(new ItemStack(Items.leather), 30); - addReturn(new ItemStack(Items.dye), 70); - addReturn(new ItemStack(Items.clay_ball), 40); - addReturn(new ItemStack(Items.stick), 40); - addReturn(new ItemStack(Items.iron_ingot), 10); - addReturn(new ItemStack(Items.gold_ingot), 6); - addReturn(new ItemStack(Items.beef), 30); - addReturn(new ItemStack(Items.ender_pearl), 2); - addReturn(new ItemStack(Blocks.planks), 20); - addReturn(new ItemStack(Blocks.waterlily), 10); - addReturn(new ItemStack(Items.experience_bottle), 3); - addReturn(new ItemStack(Blocks.gravel), 40); - addReturn(new ItemStack(Blocks.sand), 50); - addReturn(new ItemStack(Blocks.vine), 30); - addReturn(new ItemStack(Blocks.web), 4); - addReturn(new ItemStack(InitItems.itemSolidifiedExperience), 20); - } - - public static void addReturn(ItemStack stack, int chance){ - returns.add(new Return(stack, chance)); - } - - public static class Return extends WeightedRandom.Item{ - - public ItemStack returnItem; - public ItemStack inputItem; - - public Return(ItemStack returnItem, int chance){ - super(chance); - this.returnItem = returnItem; - this.inputItem = new ItemStack(InitItems.itemHairyBall); - } - - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipe/TreasureChestHandler.java b/src/main/java/de/ellpeck/actuallyadditions/recipe/TreasureChestHandler.java deleted file mode 100644 index e37dd93b1..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/recipe/TreasureChestHandler.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file ("TreasureChestHandler.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.recipe; - -import de.ellpeck.actuallyadditions.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.items.InitItems; -import de.ellpeck.actuallyadditions.items.metalists.TheJams; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - -import java.util.ArrayList; - -public class TreasureChestHandler{ - - public static ArrayList returns = new ArrayList(); - - public static void init(){ - addReturn(new ItemStack(Items.diamond), 5, 1, 2); - addReturn(new ItemStack(Items.iron_ingot), 30, 1, 5); - addReturn(new ItemStack(Items.gold_nugget), 60, 1, 8); - addReturn(new ItemStack(Items.gold_ingot), 35, 1, 3); - addReturn(new ItemStack(Items.ender_pearl), 10, 1, 2); - addReturn(new ItemStack(Items.emerald), 3, 1, 1); - addReturn(new ItemStack(Items.experience_bottle), 5, 3, 6); - addReturn(new ItemStack(InitItems.itemSolidifiedExperience), 15, 3, 6); - addReturn(new ItemStack(Items.record_11), 1, 1, 1); - addReturn(new ItemStack(Items.record_13), 1, 1, 1); - addReturn(new ItemStack(Items.record_blocks), 1, 1, 1); - addReturn(new ItemStack(Items.record_cat), 1, 1, 1); - addReturn(new ItemStack(Items.record_chirp), 1, 1, 1); - addReturn(new ItemStack(Items.record_far), 1, 1, 1); - addReturn(new ItemStack(Items.record_mall), 1, 1, 1); - addReturn(new ItemStack(Items.record_mellohi), 1, 1, 1); - addReturn(new ItemStack(Items.record_stal), 1, 1, 1); - addReturn(new ItemStack(Items.record_strad), 1, 1, 1); - addReturn(new ItemStack(Items.record_ward), 1, 1, 1); - addReturn(new ItemStack(Items.record_wait), 1, 1, 1); - addReturn(new ItemStack(Items.saddle), 5, 1, 1); - addReturn(new ItemStack(Items.name_tag), 20, 1, 2); - addReturn(new ItemStack(InitItems.itemJams, 1, TheJams.CU_BA_RA.ordinal()), 10, 1, 2); - addReturn(new ItemStack(InitItems.itemJams, 1, TheJams.GRA_KI_BA.ordinal()), 10, 1, 2); - addReturn(new ItemStack(InitItems.itemJams, 1, TheJams.PL_AP_LE.ordinal()), 10, 1, 2); - addReturn(new ItemStack(InitItems.itemJams, 1, TheJams.CH_AP_CI.ordinal()), 10, 1, 2); - addReturn(new ItemStack(InitItems.itemJams, 1, TheJams.HO_ME_KI.ordinal()), 10, 1, 2); - addReturn(new ItemStack(InitItems.itemJams, 1, TheJams.PI_CO.ordinal()), 10, 1, 2); - addReturn(new ItemStack(Items.fish), 80, 1, 3); - addReturn(new ItemStack(Items.fish, 1, 1), 60, 1, 3); - addReturn(new ItemStack(Items.fish, 1, 2), 10, 1, 1); - addReturn(new ItemStack(Items.fish, 1, 3), 40, 1, 2); - } - - public static void addReturn(ItemStack stack, int chance, int minAmount, int maxAmount){ - returns.add(new Return(stack, chance, minAmount, maxAmount)); - } - - public static class Return extends WeightedRandom.Item{ - - public ItemStack returnItem; - public ItemStack input; - public int minAmount; - public int maxAmount; - - public Return(ItemStack returnItem, int chance, int minAmount, int maxAmount){ - super(chance); - this.returnItem = returnItem; - this.input = new ItemStack(InitBlocks.blockTreasureChest); - this.minAmount = minAmount; - this.maxAmount = maxAmount; - } - - } - -}