From be421af8e2853b77f02c375f33ceec6611b5df75 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 Sep 2020 15:48:43 +0100 Subject: [PATCH] Big Refactor of the package layout Ignore this commit for diffs --- build.gradle | 6 +- .../{mod => }/booklet/InitBooklet.java | 126 +++++++++--------- .../booklet/button/BookmarkButton.java | 16 +-- .../{mod => }/booklet/button/EntryButton.java | 8 +- .../booklet/button/TrialsButton.java | 10 +- .../booklet/chapter/BookletChapter.java | 6 +- .../booklet/chapter/BookletChapterCoffee.java | 8 +- .../chapter/BookletChapterCrusher.java | 6 +- .../booklet/chapter/BookletChapterTrials.java | 10 +- .../{mod => }/booklet/entry/BookletEntry.java | 8 +- .../booklet/entry/BookletEntryAllItems.java | 2 +- .../booklet/entry/BookletEntryTrials.java | 2 +- .../{mod => }/booklet/gui/GuiBooklet.java | 22 +-- .../{mod => }/booklet/gui/GuiEntry.java | 8 +- .../{mod => }/booklet/gui/GuiMainPage.java | 22 +-- .../{mod => }/booklet/gui/GuiPage.java | 12 +- .../{mod => }/booklet/misc/BookletUtils.java | 10 +- .../booklet/misc/GuiAAAchievements.java | 6 +- .../{mod => }/booklet/page/BookletPage.java | 6 +- .../{mod => }/booklet/page/ItemDisplay.java | 14 +- .../booklet/page/PageCoffeeMachine.java | 8 +- .../{mod => }/booklet/page/PageCrafting.java | 16 +-- .../booklet/page/PageCrusherRecipe.java | 10 +- .../{mod => }/booklet/page/PageEmpowerer.java | 8 +- .../{mod => }/booklet/page/PageFurnace.java | 10 +- .../booklet/page/PageLinkButton.java | 6 +- .../{mod => }/booklet/page/PagePicture.java | 4 +- .../booklet/page/PageReconstructor.java | 10 +- .../{mod => }/booklet/page/PageTextOnly.java | 2 +- .../{mod => }/booklet/page/PageTrials.java | 12 +- .../{mod => common}/ActuallyAdditions.java | 60 ++++----- .../ClientRegistryHandler.java | 12 +- .../{mod => common}/RegistryHandler.java | 16 +-- .../achievement/InitAchievements.java | 6 +- .../achievement/TheAchievements.java | 14 +- .../blocks/BlockAtomicReconstructor.java | 19 ++- .../blocks/BlockBatteryBox.java | 10 +- .../blocks/BlockBioReactor.java | 6 +- .../blocks/BlockBlackLotus.java | 4 +- .../{mod => common}/blocks/BlockBreaker.java | 12 +- .../blocks/BlockCanolaPress.java | 10 +- .../blocks/BlockCoalGenerator.java | 10 +- .../blocks/BlockCoffeeMachine.java | 10 +- .../blocks/BlockColoredLamp.java | 14 +- .../{mod => common}/blocks/BlockCompost.java | 14 +- .../{mod => common}/blocks/BlockCrystal.java | 10 +- .../blocks/BlockCrystalCluster.java | 8 +- .../blocks/BlockDirectionalBreaker.java | 10 +- .../blocks/BlockDisplayStand.java | 10 +- .../{mod => common}/blocks/BlockDropper.java | 10 +- .../blocks/BlockEmpowerer.java | 10 +- .../blocks/BlockEnergizer.java | 12 +- .../{mod => common}/blocks/BlockFarmer.java | 10 +- .../{mod => common}/blocks/BlockFeeder.java | 11 +- .../blocks/BlockFermentingBarrel.java | 10 +- .../blocks/BlockFireworkBox.java | 11 +- .../blocks/BlockFishingNet.java | 6 +- .../blocks/BlockFluidCollector.java | 12 +- .../blocks/BlockFurnaceDouble.java | 14 +- .../blocks/BlockFurnaceSolar.java | 6 +- .../{mod => common}/blocks/BlockGeneric.java | 2 +- .../blocks/BlockGiantChest.java | 26 ++-- .../blocks/BlockGreenhouseGlass.java | 2 +- .../{mod => common}/blocks/BlockGrinder.java | 12 +- .../blocks/BlockHeatCollector.java | 6 +- .../{mod => common}/blocks/BlockInputter.java | 18 +-- .../blocks/BlockItemRepairer.java | 10 +- .../blocks/BlockItemViewer.java | 6 +- .../blocks/BlockItemViewerHopping.java | 4 +- .../blocks/BlockLampPowerer.java | 5 +- .../blocks/BlockLaserRelay.java | 22 +-- .../blocks/BlockLavaFactoryController.java | 10 +- .../blocks/BlockLeafGenerator.java | 7 +- .../{mod => common}/blocks/BlockMiner.java | 12 +- .../{mod => common}/blocks/BlockMisc.java | 10 +- .../blocks/BlockOilGenerator.java | 10 +- .../{mod => common}/blocks/BlockPhantom.java | 10 +- .../blocks/BlockPhantomBooster.java | 6 +- .../blocks/BlockPlayerInterface.java | 8 +- .../blocks/BlockRangedCollector.java | 10 +- .../blocks/BlockShockSuppressor.java | 10 +- .../{mod => common}/blocks/BlockSlabs.java | 6 +- .../blocks/BlockSmileyCloud.java | 10 +- .../blocks/BlockTinyTorch.java | 5 +- .../blocks/BlockTreasureChest.java | 2 +- .../{mod => common}/blocks/BlockWallAA.java | 5 +- .../blocks/BlockWildPlant.java | 14 +- .../blocks/BlockXPSolidifier.java | 10 +- .../{mod => common}/blocks/IHudDisplay.java | 4 +- .../{mod => common}/blocks/InitBlocks.java | 10 +- .../blocks/base/BlockBase.java | 2 +- .../blocks/base/BlockBushBase.java | 2 +- .../blocks/base/BlockContainerBase.java | 12 +- .../blocks/base/BlockFluidFlowing.java | 2 +- .../blocks/base/BlockItemBase.java | 2 +- .../blocks/base/BlockPlant.java | 4 +- .../blocks/base/BlockStair.java | 8 +- .../blocks/base/IBaseBlock.java | 2 +- .../metalists/TheColoredLampColors.java | 2 +- .../blocks/metalists/TheMiscBlocks.java | 2 +- .../blocks/metalists/TheWildPlants.java | 4 +- .../blocks/render/ActualCompostModel.java | 4 +- .../blocks/render/CompostModel.java | 2 +- .../blocks/render/IHasModel.java | 2 +- .../blocks/render/RenderBatteryBox.java | 12 +- .../blocks/render/RenderDisplayStand.java | 10 +- .../blocks/render/RenderEmpowerer.java | 10 +- .../blocks/render/RenderLaserRelay.java | 16 +-- .../render/RenderReconstructorLens.java | 8 +- .../blocks/render/RenderSmileyCloud.java | 16 +-- .../blocks/render/Transformer.java | 2 +- .../config/ConfigCategories.java | 2 +- .../{mod => common}/config/ConfigValues.java | 12 +- .../config/ConfigurationHandler.java | 4 +- .../config/GuiConfiguration.java | 4 +- .../{mod => common}/config/GuiFactory.java | 2 +- .../config/values/ConfigBoolValues.java | 4 +- .../config/values/ConfigIntListValues.java | 4 +- .../config/values/ConfigIntValues.java | 4 +- .../config/values/ConfigStringListValues.java | 4 +- .../crafting/BlockCrafting.java | 24 ++-- .../crafting/CrusherCrafting.java | 16 +-- .../crafting/FoodCrafting.java | 14 +- .../crafting/InitCrafting.java | 26 ++-- .../crafting/ItemCrafting.java | 30 ++--- .../crafting/MiscCrafting.java | 16 +-- .../crafting/RecipeBioMash.java | 12 +- .../crafting/RecipeKeepDataShaped.java | 8 +- .../crafting/RecipeKeepDataShapeless.java | 8 +- .../crafting/RecipePotionRingCharging.java | 8 +- .../crafting/ToolCrafting.java | 10 +- .../{mod => common}/creative/CreativeTab.java | 10 +- .../{mod => common}/data/PlayerData.java | 6 +- .../{mod => common}/data/WorldData.java | 8 +- .../{mod => common}/entity/EntityWorm.java | 6 +- .../{mod => common}/entity/InitEntities.java | 4 +- .../{mod => common}/entity/RenderWorm.java | 6 +- .../{mod => common}/event/ClientEvents.java | 26 ++-- .../{mod => common}/event/CommonEvents.java | 30 ++--- .../{mod => common}/fluids/FluidAA.java | 4 +- .../{mod => common}/fluids/InitFluids.java | 4 +- .../{mod => common}/gen/AAWorldGen.java | 22 +-- .../gen/WorldGenLushCaves.java | 10 +- .../gen/village/BasicTradeList.java | 2 +- .../gen/village/InitVillager.java | 30 ++--- .../VillageComponentCustomCropField.java | 4 +- .../VillageComponentEngineerHouse.java | 40 +++--- .../component/VillageComponentJamHouse.java | 12 +- .../VillageCustomCropFieldHandler.java | 4 +- .../handler/VillageEngineerHouseHandler.java | 4 +- .../handler/VillageJamHouseHandler.java | 4 +- .../inventory/ContainerBag.java | 26 ++-- .../inventory/ContainerBioReactor.java | 10 +- .../inventory/ContainerBreaker.java | 10 +- .../inventory/ContainerCanolaPress.java | 14 +- .../inventory/ContainerCoalGenerator.java | 14 +- .../inventory/ContainerCoffeeMachine.java | 18 +-- .../ContainerDirectionalBreaker.java | 14 +- .../inventory/ContainerDrill.java | 14 +- .../inventory/ContainerDropper.java | 12 +- .../inventory/ContainerEnergizer.java | 12 +- .../inventory/ContainerEnervator.java | 12 +- .../inventory/ContainerFarmer.java | 10 +- .../inventory/ContainerFeeder.java | 10 +- .../inventory/ContainerFermentingBarrel.java | 8 +- .../inventory/ContainerFilter.java | 12 +- .../inventory/ContainerFireworkBox.java | 2 +- .../inventory/ContainerFluidCollector.java | 8 +- .../inventory/ContainerFurnaceDouble.java | 12 +- .../inventory/ContainerGiantChest.java | 10 +- .../inventory/ContainerGrinder.java | 14 +- .../inventory/ContainerInputter.java | 14 +- .../ContainerLaserRelayItemWhitelist.java | 10 +- .../inventory/ContainerMiner.java | 10 +- .../inventory/ContainerOilGenerator.java | 8 +- .../inventory/ContainerPhantomPlacer.java | 10 +- .../inventory/ContainerRangedCollector.java | 12 +- .../inventory/ContainerRepairer.java | 12 +- .../inventory/ContainerSmileyCloud.java | 2 +- .../inventory/ContainerXPSolidifier.java | 14 +- .../inventory/GuiFireworkBox.java | 8 +- .../{mod => common}/inventory/GuiHandler.java | 74 +++++----- .../inventory/gui/EnergyDisplay.java | 8 +- .../inventory/gui/FilterSettingsGui.java | 10 +- .../inventory/gui/FluidDisplay.java | 6 +- .../{mod => common}/inventory/gui/GuiBag.java | 14 +- .../inventory/gui/GuiBioReactor.java | 10 +- .../inventory/gui/GuiBreaker.java | 10 +- .../inventory/gui/GuiCanolaPress.java | 10 +- .../inventory/gui/GuiCoalGenerator.java | 10 +- .../inventory/gui/GuiCoffeeMachine.java | 16 +-- .../inventory/gui/GuiDirectionalBreaker.java | 10 +- .../inventory/gui/GuiDrill.java | 10 +- .../inventory/gui/GuiDropper.java | 10 +- .../inventory/gui/GuiEnergizer.java | 10 +- .../inventory/gui/GuiEnervator.java | 10 +- .../inventory/gui/GuiFarmer.java | 10 +- .../inventory/gui/GuiFeeder.java | 14 +- .../inventory/gui/GuiFermentingBarrel.java | 10 +- .../inventory/gui/GuiFilter.java | 10 +- .../inventory/gui/GuiFluidCollector.java | 10 +- .../inventory/gui/GuiFurnaceDouble.java | 16 +-- .../inventory/gui/GuiGiantChest.java | 16 +-- .../inventory/gui/GuiGrinder.java | 16 +-- .../inventory/gui/GuiInputter.java | 16 +-- .../gui/GuiLaserRelayItemWhitelist.java | 18 +-- .../inventory/gui/GuiMiner.java | 14 +- .../inventory/gui/GuiOilGenerator.java | 12 +- .../inventory/gui/GuiPhantomPlacer.java | 16 +-- .../inventory/gui/GuiRangedCollector.java | 12 +- .../inventory/gui/GuiRepairer.java | 10 +- .../inventory/gui/GuiSmileyCloud.java | 18 +-- .../inventory/gui/GuiWtfMojang.java | 2 +- .../inventory/gui/GuiXPSolidifier.java | 14 +- .../inventory/gui/TexturedButton.java | 2 +- .../inventory/slot/SlotDeletion.java | 4 +- .../inventory/slot/SlotFilter.java | 10 +- .../inventory/slot/SlotImmovable.java | 2 +- .../slot/SlotItemHandlerUnconditioned.java | 4 +- .../inventory/slot/SlotOutput.java | 4 +- .../{mod => common}/items/InitItems.java | 34 ++--- .../{mod => common}/items/ItemAllToolAA.java | 10 +- .../{mod => common}/items/ItemAxeAA.java | 4 +- .../{mod => common}/items/ItemBag.java | 14 +- .../{mod => common}/items/ItemBattery.java | 16 +-- .../{mod => common}/items/ItemBooklet.java | 18 +-- .../items/ItemChestToCrateUpgrade.java | 8 +- .../{mod => common}/items/ItemCoffee.java | 12 +- .../{mod => common}/items/ItemCoffeeBean.java | 4 +- .../items/ItemCrafterOnAStick.java | 8 +- .../{mod => common}/items/ItemCrystal.java | 10 +- .../items/ItemCrystalShard.java | 12 +- .../{mod => common}/items/ItemDrill.java | 24 ++-- .../items/ItemDrillUpgrade.java | 4 +- .../{mod => common}/items/ItemDust.java | 12 +- .../items/ItemEngineerGoggles.java | 10 +- .../{mod => common}/items/ItemFertilizer.java | 6 +- .../items/ItemFillingWand.java | 12 +- .../{mod => common}/items/ItemFilter.java | 14 +- .../{mod => common}/items/ItemFoods.java | 12 +- .../{mod => common}/items/ItemGeneric.java | 4 +- .../{mod => common}/items/ItemGrowthRing.java | 6 +- .../{mod => common}/items/ItemHairyBall.java | 12 +- .../{mod => common}/items/ItemJams.java | 12 +- .../{mod => common}/items/ItemKnife.java | 4 +- .../items/ItemLaserRelayUpgrade.java | 4 +- .../items/ItemLaserWrench.java | 10 +- .../{mod => common}/items/ItemLeafBlower.java | 4 +- .../{mod => common}/items/ItemMagnetRing.java | 6 +- .../{mod => common}/items/ItemMisc.java | 12 +- .../items/ItemPhantomConnector.java | 10 +- .../{mod => common}/items/ItemPickaxeAA.java | 4 +- .../items/ItemPlayerProbe.java | 12 +- .../{mod => common}/items/ItemPotionRing.java | 16 +-- .../items/ItemResonantRice.java | 4 +- .../{mod => common}/items/ItemShovelAA.java | 4 +- .../items/ItemSolidifiedExperience.java | 8 +- .../items/ItemSpawnerChanger.java | 12 +- .../{mod => common}/items/ItemTeleStaff.java | 6 +- .../{mod => common}/items/ItemWaterBowl.java | 10 +- .../items/ItemWaterRemovalRing.java | 6 +- .../items/ItemWingsOfTheBats.java | 16 +-- .../{mod => common}/items/ItemWorm.java | 10 +- .../items/base/ItemArmorAA.java | 14 +- .../{mod => common}/items/base/ItemBase.java | 6 +- .../items/base/ItemEnergy.java | 8 +- .../items/base/ItemFoodBase.java | 6 +- .../items/base/ItemFoodSeed.java | 8 +- .../{mod => common}/items/base/ItemHoeAA.java | 10 +- .../{mod => common}/items/base/ItemSeed.java | 8 +- .../items/base/ItemSwordAA.java | 12 +- .../items/base/ItemToolAA.java | 12 +- .../{mod => common}/items/lens/ItemLens.java | 4 +- .../{mod => common}/items/lens/LensColor.java | 4 +- .../{mod => common}/items/lens/LensDeath.java | 4 +- .../items/lens/LensDetonation.java | 2 +- .../items/lens/LensDisenchanting.java | 6 +- .../items/lens/LensDisruption.java | 8 +- .../items/lens/LensKiller.java | 2 +- .../items/lens/LensMining.java | 14 +- .../items/lens/LensRecipeHandler.java | 18 +-- .../{mod => common}/items/lens/Lenses.java | 2 +- .../items/metalists/TheCrystals.java | 4 +- .../items/metalists/TheDusts.java | 9 +- .../items/metalists/TheFoods.java | 6 +- .../items/metalists/TheJams.java | 2 +- .../items/metalists/TheMiscItems.java | 4 +- .../items/metalists/ThePotionRings.java | 2 +- .../jei/JEIActuallyAdditionsPlugin.java | 40 +++--- .../jei/RecipeWrapperWithButton.java | 12 +- .../jei/booklet/BookletRecipeCategory.java | 6 +- .../jei/booklet/BookletRecipeWrapper.java | 8 +- .../coffee/CoffeeMachineRecipeCategory.java | 10 +- .../coffee/CoffeeMachineRecipeWrapper.java | 18 +-- .../jei/compost/CompostRecipeCategory.java | 8 +- .../jei/compost/CompostRecipeWrapper.java | 10 +- .../jei/crusher/CrusherRecipeCategory.java | 10 +- .../jei/crusher/CrusherRecipeWrapper.java | 12 +- .../empowerer/EmpowererRecipeCategory.java | 8 +- .../jei/empowerer/EmpowererRecipeWrapper.java | 12 +- .../ReconstructorRecipeCategory.java | 10 +- .../ReconstructorRecipeWrapper.java | 16 +-- .../material/InitArmorMaterials.java | 4 +- .../material/InitToolMaterials.java | 4 +- .../{mod => common}/misc/BannerHelper.java | 6 +- .../{mod => common}/misc/DamageSources.java | 4 +- .../misc/DispenserHandlerFertilize.java | 2 +- .../{mod => common}/misc/DungeonLoot.java | 18 +-- .../{mod => common}/misc/SoundHandler.java | 6 +- .../misc/apiimpl/ConnectionPair.java | 2 +- .../apiimpl/LaserRelayConnectionHandler.java | 6 +- .../misc/apiimpl/MethodHandler.java | 26 ++-- .../apiimpl/farmer/CactusFarmerBehavior.java | 5 +- .../apiimpl/farmer/DefaultFarmerBehavior.java | 4 +- .../farmer/MelonPumpkinFarmerBehavior.java | 4 +- .../farmer/NetherWartFarmerBehavior.java | 2 +- .../apiimpl/farmer/ReedFarmerBehavior.java | 2 +- .../farmer/exu/EnderlillyFarmerBehavior.java | 2 +- .../farmer/exu/ExUPlantFarmerBehavior.java | 4 +- .../farmer/exu/RedOrchidFarmerBehavior.java | 2 +- .../misc/cloud/ISmileyCloudEasterEgg.java | 2 +- .../misc/cloud/SmileyCloudEasterEggs.java | 12 +- .../misc/special/RenderSpecial.java | 6 +- .../misc/special/SpecialRenderInit.java | 4 +- .../misc/special/ThreadSpecialFetcher.java | 4 +- .../{mod => common}/network/IDataHandler.java | 2 +- .../network/PacketClientToServer.java | 4 +- .../network/PacketHandler.java | 25 ++-- .../network/PacketHandlerHelper.java | 8 +- .../network/PacketServerToClient.java | 4 +- .../network/gui/IButtonReactor.java | 2 +- .../network/gui/INumberReactor.java | 2 +- .../network/gui/IStringReactor.java | 2 +- .../{mod => common}/ore/InitOreDict.java | 16 +-- .../particle/ParticleBeam.java | 4 +- .../particle/ParticleLaserItem.java | 4 +- .../{mod => common}/proxy/ClientProxy.java | 58 ++++---- .../{mod => common}/proxy/IProxy.java | 2 +- .../{mod => common}/proxy/ServerProxy.java | 8 +- .../recipe/ColorLensRotator.java | 2 +- .../recipe/CrusherRecipeRegistry.java | 8 +- .../recipe/EmpowererHandler.java | 12 +- .../recipe/EnchBookConversion.java | 2 +- .../recipe/HairyBallHandler.java | 4 +- .../recipe/TreasureChestHandler.java | 6 +- .../tile/CustomEnergyStorage.java | 2 +- .../{mod => common}/tile/FilterSettings.java | 12 +- .../{mod => common}/tile/IEnergyDisplay.java | 2 +- .../tile/ISharingEnergyProvider.java | 2 +- .../tile/ISharingFluidHandler.java | 2 +- .../tile/TileEntityAtomicReconstructor.java | 16 +-- .../{mod => common}/tile/TileEntityBase.java | 10 +- .../tile/TileEntityBatteryBox.java | 10 +- .../tile/TileEntityBioReactor.java | 8 +- .../tile/TileEntityBreaker.java | 8 +- .../tile/TileEntityCanolaPress.java | 16 +-- .../tile/TileEntityCoalGenerator.java | 8 +- .../tile/TileEntityCoffeeMachine.java | 20 +-- .../tile/TileEntityCompost.java | 10 +- .../tile/TileEntityDirectionalBreaker.java | 8 +- .../tile/TileEntityDisplayStand.java | 4 +- .../tile/TileEntityDropper.java | 6 +- .../tile/TileEntityEmpowerer.java | 8 +- .../tile/TileEntityEnergizer.java | 8 +- .../tile/TileEntityEnervator.java | 8 +- .../tile/TileEntityFarmer.java | 12 +- .../tile/TileEntityFeeder.java | 4 +- .../tile/TileEntityFermentingBarrel.java | 6 +- .../tile/TileEntityFireworkBox.java | 4 +- .../tile/TileEntityFishingNet.java | 4 +- .../tile/TileEntityFluidCollector.java | 6 +- .../tile/TileEntityFluidPlacer.java | 2 +- .../tile/TileEntityFurnaceDouble.java | 16 +-- .../tile/TileEntityFurnaceSolar.java | 2 +- .../tile/TileEntityGiantChest.java | 10 +- .../tile/TileEntityGiantChestLarge.java | 2 +- .../tile/TileEntityGiantChestMedium.java | 2 +- .../tile/TileEntityGrinder.java | 18 +-- .../tile/TileEntityGrinderDouble.java | 2 +- .../tile/TileEntityHeatCollector.java | 4 +- .../tile/TileEntityInputter.java | 18 +-- .../tile/TileEntityInputterAdvanced.java | 2 +- .../tile/TileEntityInventoryBase.java | 10 +- .../tile/TileEntityItemRepairer.java | 12 +- .../tile/TileEntityItemViewer.java | 16 +-- .../tile/TileEntityItemViewerHopping.java | 10 +- .../tile/TileEntityLaserRelay.java | 8 +- .../tile/TileEntityLaserRelayEnergy.java | 8 +- .../TileEntityLaserRelayEnergyAdvanced.java | 2 +- .../TileEntityLaserRelayEnergyExtreme.java | 2 +- .../tile/TileEntityLaserRelayFluids.java | 10 +- .../tile/TileEntityLaserRelayItem.java | 12 +- .../TileEntityLaserRelayItemWhitelist.java | 16 +-- .../tile/TileEntityLavaFactoryController.java | 8 +- .../tile/TileEntityLeafGenerator.java | 4 +- .../{mod => common}/tile/TileEntityMiner.java | 16 +-- .../tile/TileEntityOilGenerator.java | 6 +- .../tile/TileEntityPhantomBooster.java | 2 +- .../tile/TileEntityPhantomBreaker.java | 8 +- .../tile/TileEntityPhantomEnergyface.java | 4 +- .../tile/TileEntityPhantomItemface.java | 8 +- .../tile/TileEntityPhantomLiquiface.java | 4 +- .../tile/TileEntityPhantomPlacer.java | 16 +-- .../tile/TileEntityPhantomRedstoneface.java | 2 +- .../tile/TileEntityPhantomface.java | 6 +- .../tile/TileEntityPlacer.java | 6 +- .../tile/TileEntityPlayerInterface.java | 4 +- .../tile/TileEntityRangedCollector.java | 8 +- .../tile/TileEntityShockSuppressor.java | 2 +- .../tile/TileEntitySmileyCloud.java | 4 +- .../tile/TileEntityXPSolidifier.java | 14 +- .../update/ThreadUpdateChecker.java | 8 +- .../{mod => common}/update/UpdateChecker.java | 10 +- .../{mod => common}/util/AssetUtil.java | 12 +- .../{mod => common}/util/AwfulUtil.java | 2 +- .../util/FluidStateMapper.java | 4 +- .../util/IColorProvidingBlock.java | 2 +- .../util/IColorProvidingItem.java | 2 +- .../util/ItemStackHandlerAA.java | 2 +- .../{mod => common}/util/ItemUtil.java | 12 +- .../util/NetHandlerSpaghettiServer.java | 2 +- .../{mod => common}/util/RecipeUtil.java | 4 +- .../{mod => common}/util/RefHelp.java | 2 +- .../{mod => common}/util/StackUtil.java | 6 +- .../{mod => common}/util/StringUtil.java | 4 +- .../{mod => common}/util/Util.java | 4 +- .../util/VanillaPacketDispatcher.java | 2 +- .../{mod => common}/util/WorldUtil.java | 8 +- .../util/compat/CommonCapsUtil.java | 8 +- .../util/compat/CompatFastBench.java | 6 +- .../util/compat/CompatUtil.java | 6 +- .../util/compat/IMCHandler.java | 18 +-- .../SlotlessableItemHandlerWrapper.java | 2 +- .../util/crafting/BlankRecipe.java | 2 +- .../util/crafting/IRecipeGrouped.java | 2 +- .../util/crafting/RecipeHandler.java | 2 +- .../util/crafting/RecipeHelper.java | 6 +- .../data/AADataGenerator.java | 4 + 438 files changed, 2071 insertions(+), 2103 deletions(-) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/InitBooklet.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/button/BookmarkButton.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/button/EntryButton.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/button/TrialsButton.java (77%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/chapter/BookletChapter.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/chapter/BookletChapterCoffee.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/chapter/BookletChapterCrusher.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/chapter/BookletChapterTrials.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/entry/BookletEntry.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/entry/BookletEntryAllItems.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/entry/BookletEntryTrials.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/gui/GuiBooklet.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/gui/GuiEntry.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/gui/GuiMainPage.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/gui/GuiPage.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/misc/BookletUtils.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/misc/GuiAAAchievements.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/BookletPage.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/ItemDisplay.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageCoffeeMachine.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageCrafting.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageCrusherRecipe.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageEmpowerer.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageFurnace.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageLinkButton.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PagePicture.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageReconstructor.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageTextOnly.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => }/booklet/page/PageTrials.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/ActuallyAdditions.java (70%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/ClientRegistryHandler.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/RegistryHandler.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/achievement/InitAchievements.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/achievement/TheAchievements.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockAtomicReconstructor.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockBatteryBox.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockBioReactor.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockBlackLotus.java (77%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockBreaker.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockCanolaPress.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockCoalGenerator.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockCoffeeMachine.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockColoredLamp.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockCompost.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockCrystal.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockCrystalCluster.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockDirectionalBreaker.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockDisplayStand.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockDropper.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockEmpowerer.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockEnergizer.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFarmer.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFeeder.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFermentingBarrel.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFireworkBox.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFishingNet.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFluidCollector.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFurnaceDouble.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockFurnaceSolar.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockGeneric.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockGiantChest.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockGreenhouseGlass.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockGrinder.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockHeatCollector.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockInputter.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockItemRepairer.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockItemViewer.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockItemViewerHopping.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockLampPowerer.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockLaserRelay.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockLavaFactoryController.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockLeafGenerator.java (74%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockMiner.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockMisc.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockOilGenerator.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockPhantom.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockPhantomBooster.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockPlayerInterface.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockRangedCollector.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockShockSuppressor.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockSlabs.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockSmileyCloud.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockTinyTorch.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockTreasureChest.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockWallAA.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockWildPlant.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/BlockXPSolidifier.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/IHudDisplay.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/InitBlocks.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockBase.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockBushBase.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockContainerBase.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockFluidFlowing.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockItemBase.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockPlant.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/BlockStair.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/base/IBaseBlock.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/metalists/TheColoredLampColors.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/metalists/TheMiscBlocks.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/metalists/TheWildPlants.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/ActualCompostModel.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/CompostModel.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/IHasModel.java (59%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/RenderBatteryBox.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/RenderDisplayStand.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/RenderEmpowerer.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/RenderLaserRelay.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/RenderReconstructorLens.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/RenderSmileyCloud.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/blocks/render/Transformer.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/ConfigCategories.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/ConfigValues.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/ConfigurationHandler.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/GuiConfiguration.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/GuiFactory.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/values/ConfigBoolValues.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/values/ConfigIntListValues.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/values/ConfigIntValues.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/config/values/ConfigStringListValues.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/BlockCrafting.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/CrusherCrafting.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/FoodCrafting.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/InitCrafting.java (70%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/ItemCrafting.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/MiscCrafting.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/RecipeBioMash.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/RecipeKeepDataShaped.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/RecipeKeepDataShapeless.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/RecipePotionRingCharging.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/crafting/ToolCrafting.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/creative/CreativeTab.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/data/PlayerData.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/data/WorldData.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/entity/EntityWorm.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/entity/InitEntities.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/entity/RenderWorm.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/event/ClientEvents.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/event/CommonEvents.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/fluids/FluidAA.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/fluids/InitFluids.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/AAWorldGen.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/WorldGenLushCaves.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/BasicTradeList.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/InitVillager.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/component/VillageComponentCustomCropField.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/component/VillageComponentEngineerHouse.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/component/VillageComponentJamHouse.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/component/handler/VillageCustomCropFieldHandler.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/component/handler/VillageEngineerHouseHandler.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/gen/village/component/handler/VillageJamHouseHandler.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerBag.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerBioReactor.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerBreaker.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerCanolaPress.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerCoalGenerator.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerCoffeeMachine.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerDirectionalBreaker.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerDrill.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerDropper.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerEnergizer.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerEnervator.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFarmer.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFeeder.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFermentingBarrel.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFilter.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFireworkBox.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFluidCollector.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerFurnaceDouble.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerGiantChest.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerGrinder.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerInputter.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerLaserRelayItemWhitelist.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerMiner.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerOilGenerator.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerPhantomPlacer.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerRangedCollector.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerRepairer.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerSmileyCloud.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/ContainerXPSolidifier.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/GuiFireworkBox.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/GuiHandler.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/EnergyDisplay.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/FilterSettingsGui.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/FluidDisplay.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiBag.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiBioReactor.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiBreaker.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiCanolaPress.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiCoalGenerator.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiCoffeeMachine.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiDirectionalBreaker.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiDrill.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiDropper.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiEnergizer.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiEnervator.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiFarmer.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiFeeder.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiFermentingBarrel.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiFilter.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiFluidCollector.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiFurnaceDouble.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiGiantChest.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiGrinder.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiInputter.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiLaserRelayItemWhitelist.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiMiner.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiOilGenerator.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiPhantomPlacer.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiRangedCollector.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiRepairer.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiSmileyCloud.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiWtfMojang.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/GuiXPSolidifier.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/gui/TexturedButton.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/slot/SlotDeletion.java (72%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/slot/SlotFilter.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/slot/SlotImmovable.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/slot/SlotItemHandlerUnconditioned.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/inventory/slot/SlotOutput.java (72%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/InitItems.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemAllToolAA.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemAxeAA.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemBag.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemBattery.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemBooklet.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemChestToCrateUpgrade.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemCoffee.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemCoffeeBean.java (75%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemCrafterOnAStick.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemCrystal.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemCrystalShard.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemDrill.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemDrillUpgrade.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemDust.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemEngineerGoggles.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemFertilizer.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemFillingWand.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemFilter.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemFoods.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemGeneric.java (74%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemGrowthRing.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemHairyBall.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemJams.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemKnife.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemLaserRelayUpgrade.java (74%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemLaserWrench.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemLeafBlower.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemMagnetRing.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemMisc.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemPhantomConnector.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemPickaxeAA.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemPlayerProbe.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemPotionRing.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemResonantRice.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemShovelAA.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemSolidifiedExperience.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemSpawnerChanger.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemTeleStaff.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemWaterBowl.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemWaterRemovalRing.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemWingsOfTheBats.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/ItemWorm.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemArmorAA.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemBase.java (80%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemEnergy.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemFoodBase.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemFoodSeed.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemHoeAA.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemSeed.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemSwordAA.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/base/ItemToolAA.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/ItemLens.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensColor.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensDeath.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensDetonation.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensDisenchanting.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensDisruption.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensKiller.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensMining.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/LensRecipeHandler.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/lens/Lenses.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/metalists/TheCrystals.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/metalists/TheDusts.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/metalists/TheFoods.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/metalists/TheJams.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/metalists/TheMiscItems.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/items/metalists/ThePotionRings.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/JEIActuallyAdditionsPlugin.java (78%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/RecipeWrapperWithButton.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/booklet/BookletRecipeCategory.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/booklet/BookletRecipeWrapper.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/coffee/CoffeeMachineRecipeCategory.java (85%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/coffee/CoffeeMachineRecipeWrapper.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/compost/CompostRecipeCategory.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/compost/CompostRecipeWrapper.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/crusher/CrusherRecipeCategory.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/crusher/CrusherRecipeWrapper.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/empowerer/EmpowererRecipeCategory.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/empowerer/EmpowererRecipeWrapper.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/reconstructor/ReconstructorRecipeCategory.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/jei/reconstructor/ReconstructorRecipeWrapper.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/material/InitArmorMaterials.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/material/InitToolMaterials.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/BannerHelper.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/DamageSources.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/DispenserHandlerFertilize.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/DungeonLoot.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/SoundHandler.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/ConnectionPair.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/LaserRelayConnectionHandler.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/MethodHandler.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/CactusFarmerBehavior.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/DefaultFarmerBehavior.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/NetherWartFarmerBehavior.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/ReedFarmerBehavior.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java (87%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/cloud/ISmileyCloudEasterEgg.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/cloud/SmileyCloudEasterEggs.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/special/RenderSpecial.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/special/SpecialRenderInit.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/misc/special/ThreadSpecialFetcher.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/IDataHandler.java (81%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/PacketClientToServer.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/PacketHandler.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/PacketHandlerHelper.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/PacketServerToClient.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/gui/IButtonReactor.java (86%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/gui/INumberReactor.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/network/gui/IStringReactor.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/ore/InitOreDict.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/particle/ParticleBeam.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/particle/ParticleLaserItem.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/proxy/ClientProxy.java (74%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/proxy/IProxy.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/proxy/ServerProxy.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/recipe/ColorLensRotator.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/recipe/CrusherRecipeRegistry.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/recipe/EmpowererHandler.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/recipe/EnchBookConversion.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/recipe/HairyBallHandler.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/recipe/TreasureChestHandler.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/CustomEnergyStorage.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/FilterSettings.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/IEnergyDisplay.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/ISharingEnergyProvider.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/ISharingFluidHandler.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityAtomicReconstructor.java (90%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityBase.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityBatteryBox.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityBioReactor.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityBreaker.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityCanolaPress.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityCoalGenerator.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityCoffeeMachine.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityCompost.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityDirectionalBreaker.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityDisplayStand.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityDropper.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityEmpowerer.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityEnergizer.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityEnervator.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFarmer.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFeeder.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFermentingBarrel.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFireworkBox.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFishingNet.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFluidCollector.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFluidPlacer.java (78%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFurnaceDouble.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityFurnaceSolar.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityGiantChest.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityGiantChestLarge.java (76%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityGiantChestMedium.java (77%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityGrinder.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityGrinderDouble.java (78%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityHeatCollector.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityInputter.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityInputterAdvanced.java (79%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityInventoryBase.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityItemRepairer.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityItemViewer.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityItemViewerHopping.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelay.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelayEnergy.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelayEnergyAdvanced.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelayEnergyExtreme.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelayFluids.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelayItem.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLaserRelayItemWhitelist.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLavaFactoryController.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityLeafGenerator.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityMiner.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityOilGenerator.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomBooster.java (74%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomBreaker.java (59%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomEnergyface.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomItemface.java (82%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomLiquiface.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomPlacer.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomRedstoneface.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPhantomface.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPlacer.java (57%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityPlayerInterface.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityRangedCollector.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityShockSuppressor.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntitySmileyCloud.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/tile/TileEntityXPSolidifier.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/update/ThreadUpdateChecker.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/update/UpdateChecker.java (88%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/AssetUtil.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/AwfulUtil.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/FluidStateMapper.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/IColorProvidingBlock.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/IColorProvidingItem.java (83%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/ItemStackHandlerAA.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/ItemUtil.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/NetHandlerSpaghettiServer.java (99%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/RecipeUtil.java (89%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/RefHelp.java (99%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/StackUtil.java (97%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/StringUtil.java (96%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/Util.java (94%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/VanillaPacketDispatcher.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/WorldUtil.java (98%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/compat/CommonCapsUtil.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/compat/CompatFastBench.java (93%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/compat/CompatUtil.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/compat/IMCHandler.java (57%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/compat/SlotlessableItemHandlerWrapper.java (91%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/crafting/BlankRecipe.java (92%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/crafting/IRecipeGrouped.java (53%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/crafting/RecipeHandler.java (95%) rename src/main/java/de/ellpeck/actuallyadditions/{mod => common}/util/crafting/RecipeHelper.java (98%) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/data/AADataGenerator.java diff --git a/build.gradle b/build.gradle index b0b5c8e10..2311cfc26 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,10 @@ archivesBaseName = "actuallyadditions-${mc_version}" sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' +sourceSets { + main.resources.srcDirs += 'src/generated/resources' +} + minecraft { mappings channel: "snapshot", version: mcp_version // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -47,7 +51,7 @@ minecraft { } data { workingDirectory project.file('run/data') - args "--mod", "actuallyadditions", "--all", "--output", file('src/generated/resources/'), "--existing", "\"" + sourceSets.main.resources.srcDirs[0] + "\"" + args "--mod", "actuallyadditions", "--all", "--output", file('src/generated/resources/'), "--existing", file('src/main/resources') mods { actuallyadditions { source sourceSets.main diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java index f85b07ad6..688c09d6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet; +package de.ellpeck.actuallyadditions.booklet; import java.util.ArrayList; import java.util.Arrays; @@ -10,68 +10,68 @@ import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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.chapter.BookletChapterTrials; -import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry; -import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllItems; -import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryTrials; -import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrafting; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrusherRecipe; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageEmpowerer; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageFurnace; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageLinkButton; -import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageReconstructor; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageTextOnly; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.crafting.BlockCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.FoodCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.MiscCrafting; -import de.ellpeck.actuallyadditions.mod.crafting.ToolCrafting; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.gen.AAWorldGen; -import de.ellpeck.actuallyadditions.mod.gen.WorldGenLushCaves; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats; -import de.ellpeck.actuallyadditions.mod.items.lens.LensDisenchanting; -import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; -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.recipe.EmpowererHandler; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceSolar; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityHeatCollector; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyAdvanced; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyExtreme; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLavaFactoryController; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLeafGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlayerInterface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityShockSuppressor; -import de.ellpeck.actuallyadditions.mod.update.UpdateChecker; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.common.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.chapter.BookletChapterTrials; +import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry; +import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllItems; +import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryTrials; +import de.ellpeck.actuallyadditions.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.booklet.page.PageCrafting; +import de.ellpeck.actuallyadditions.booklet.page.PageCrusherRecipe; +import de.ellpeck.actuallyadditions.booklet.page.PageEmpowerer; +import de.ellpeck.actuallyadditions.booklet.page.PageFurnace; +import de.ellpeck.actuallyadditions.booklet.page.PageLinkButton; +import de.ellpeck.actuallyadditions.booklet.page.PagePicture; +import de.ellpeck.actuallyadditions.booklet.page.PageReconstructor; +import de.ellpeck.actuallyadditions.booklet.page.PageTextOnly; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.crafting.BlockCrafting; +import de.ellpeck.actuallyadditions.common.crafting.CrusherCrafting; +import de.ellpeck.actuallyadditions.common.crafting.FoodCrafting; +import de.ellpeck.actuallyadditions.common.crafting.ItemCrafting; +import de.ellpeck.actuallyadditions.common.crafting.MiscCrafting; +import de.ellpeck.actuallyadditions.common.crafting.ToolCrafting; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.gen.AAWorldGen; +import de.ellpeck.actuallyadditions.common.gen.WorldGenLushCaves; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemWingsOfTheBats; +import de.ellpeck.actuallyadditions.common.items.lens.LensDisenchanting; +import de.ellpeck.actuallyadditions.common.items.lens.LensRecipeHandler; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.recipe.EmpowererHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFireworkBox; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFurnaceSolar; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.common.tile.TileEntityHeatCollector; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergyAdvanced; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergyExtreme; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLavaFactoryController; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLeafGenerator; +import de.ellpeck.actuallyadditions.common.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPhantomface; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPlayerInterface; +import de.ellpeck.actuallyadditions.common.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.common.tile.TileEntityShockSuppressor; +import de.ellpeck.actuallyadditions.common.update.UpdateChecker; +import de.ellpeck.actuallyadditions.common.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/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java index 41b2476a9..049ce41c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/BookmarkButton.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.mod.booklet.button; +package de.ellpeck.actuallyadditions.common.booklet.button; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiPage; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.booklet.gui.GuiPage; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java index b12d47cef..64c2d0dda 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/EntryButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/EntryButton.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.booklet.button; +package de.ellpeck.actuallyadditions.common.booklet.button; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java similarity index 77% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java index 2c4b3189b..b823fadc9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TrialsButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/button/TrialsButton.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.booklet.button; +package de.ellpeck.actuallyadditions.common.booklet.button; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.inventory.gui.TexturedButton; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; public class TrialsButton extends TexturedButton { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java index 14eb3898e..1177878b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapter.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.booklet.chapter; +package de.ellpeck.actuallyadditions.common.booklet.chapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java index f7e954444..dd989a5b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.chapter; +package de.ellpeck.actuallyadditions.common.booklet.chapter; import java.util.ArrayList; import java.util.Arrays; @@ -8,9 +8,9 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; +import de.ellpeck.actuallyadditions.common.booklet.page.BookletPage; +import de.ellpeck.actuallyadditions.common.booklet.page.PageCoffeeMachine; +import de.ellpeck.actuallyadditions.common.items.ItemCoffee; import net.minecraft.item.ItemStack; public class BookletChapterCoffee extends BookletChapter { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java index a99bada7e..b79361897 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.chapter; +package de.ellpeck.actuallyadditions.common.booklet.chapter; import java.util.ArrayList; import java.util.Arrays; @@ -7,8 +7,8 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrusherRecipe; -import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; +import de.ellpeck.actuallyadditions.common.booklet.page.PageCrusherRecipe; +import de.ellpeck.actuallyadditions.common.crafting.CrusherCrafting; import net.minecraft.item.ItemStack; public class BookletChapterCrusher extends BookletChapter { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java index bbd1ffc08..a53611e0e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterTrials.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.booklet.chapter; +package de.ellpeck.actuallyadditions.common.booklet.chapter; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageTrials; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.page.PageTrials; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java index 69008e721..1a4d3022d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntry.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.entry; +package de.ellpeck.actuallyadditions.common.booklet.entry; import java.util.ArrayList; import java.util.List; @@ -8,9 +8,9 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllItems.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllItems.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java index 78ad25bff..4ef6c6266 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryAllItems.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.entry; +package de.ellpeck.actuallyadditions.common.booklet.entry; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryTrials.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryTrials.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java index f857f0fb8..dfea18dc9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/entry/BookletEntryTrials.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.entry; +package de.ellpeck.actuallyadditions.common.booklet.entry; public class BookletEntryTrials extends BookletEntry { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java index d8a47a865..d5e37dce8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiBooklet.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.gui; +package de.ellpeck.actuallyadditions.common.booklet.gui; import java.io.IOException; import java.util.Arrays; @@ -10,16 +10,16 @@ import org.lwjgl.input.Mouse; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton; -import de.ellpeck.actuallyadditions.mod.booklet.button.TrialsButton; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave; -import de.ellpeck.actuallyadditions.mod.inventory.gui.TexturedButton; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.button.BookmarkButton; +import de.ellpeck.actuallyadditions.common.booklet.button.TrialsButton; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java index 0ce66f40d..40a0218c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiEntry.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.gui; +package de.ellpeck.actuallyadditions.common.booklet.gui; import java.io.IOException; import java.util.List; @@ -7,9 +7,9 @@ import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.booklet.button.EntryButton; -import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryTrials; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.booklet.button.EntryButton; +import de.ellpeck.actuallyadditions.common.booklet.entry.BookletEntryTrials; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java index e6f687e88..acbb938b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiMainPage.java @@ -8,7 +8,7 @@ * © 2015-2017 Ellpeck */ -package de.ellpeck.actuallyadditions.mod.booklet.gui; +package de.ellpeck.actuallyadditions.common.booklet.gui; import java.io.IOException; import java.util.ArrayList; @@ -16,16 +16,16 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet; -import de.ellpeck.actuallyadditions.mod.booklet.button.EntryButton; -import de.ellpeck.actuallyadditions.mod.config.GuiConfiguration; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave; -import de.ellpeck.actuallyadditions.mod.inventory.gui.TexturedButton; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.common.booklet.button.EntryButton; +import de.ellpeck.actuallyadditions.common.config.GuiConfiguration; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java index 2888e837e..ad7472196 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/gui/GuiPage.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.gui; +package de.ellpeck.actuallyadditions.common.booklet.gui; import java.awt.Desktop; import java.io.IOException; @@ -10,11 +10,11 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.booklet.page.ItemDisplay; -import de.ellpeck.actuallyadditions.mod.inventory.gui.TexturedButton; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.booklet.page.ItemDisplay; +import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/misc/BookletUtils.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/BookletUtils.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/misc/BookletUtils.java index 1b6663003..eb75a15dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/BookletUtils.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/misc/BookletUtils.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.misc; +package de.ellpeck.actuallyadditions.booklet.misc; import java.util.List; @@ -6,10 +6,10 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiEntry; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiMainPage; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiPage; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.booklet.gui.GuiEntry; +import de.ellpeck.actuallyadditions.booklet.gui.GuiMainPage; +import de.ellpeck.actuallyadditions.booklet.gui.GuiPage; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/misc/GuiAAAchievements.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/misc/GuiAAAchievements.java index 586d346d7..85dd3ff57 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/misc/GuiAAAchievements.java @@ -1,9 +1,9 @@ //TODO Achievement GUI? /* -package de.ellpeck.actuallyadditions.mod.booklet.misc; +package de.ellpeck.actuallyadditions.booklet.misc; -import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.common.achievement.InitAchievements; +import de.ellpeck.actuallyadditions.common.util.ModUtil; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatisticsManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/BookletPage.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/BookletPage.java index 5b11f379d..2503fe2a2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/BookletPage.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.ArrayList; import java.util.Collections; @@ -9,8 +9,8 @@ import java.util.Map; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/ItemDisplay.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/ItemDisplay.java index dd1d57459..59bf81cee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/ItemDisplay.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiPage; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.booklet.gui.GuiPage; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.util.ITooltipFlag.TooltipFlags; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java index 6cd53378c..0f9ee3f45 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrafting.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrafting.java index 9335283e9..c0a6fc65e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrafting.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.Arrays; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.util.RefHelp; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; -import de.ellpeck.actuallyadditions.mod.util.crafting.BlankRecipe; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.util.RefHelp; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; +import de.ellpeck.actuallyadditions.common.util.crafting.BlankRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java index 06024e9c0..c1ebbe3b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageEmpowerer.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageEmpowerer.java index 3b89fc377..0164a6a3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageEmpowerer.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageFurnace.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageFurnace.java index 26023d0b0..fcdbd90ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageFurnace.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.List; import java.util.Map; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.fml.client.config.GuiUtils; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageLinkButton.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageLinkButton.java index 3f4caf467..0f5fe4e0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageLinkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageLinkButton.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.awt.Desktop; import java.net.URI; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PagePicture.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PagePicture.java index 9f119ef8b..69e607922 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PagePicture.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.config.GuiUtils; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java index 8790d89c1..3454af3e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java index df9dcb628..32bc47812 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTrials.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java rename to src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTrials.java index 1cf02b7cd..ed68fe97e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTrials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageTrials.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.booklet.page; +package de.ellpeck.actuallyadditions.booklet.page; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java similarity index 70% rename from src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java rename to src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java index 9db911b0a..465887eef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java @@ -1,36 +1,36 @@ -package de.ellpeck.actuallyadditions.mod; +package de.ellpeck.actuallyadditions.common; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -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.data.WorldData; -import de.ellpeck.actuallyadditions.mod.entity.InitEntities; -import de.ellpeck.actuallyadditions.mod.event.CommonEvents; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.gen.AAWorldGen; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; -import de.ellpeck.actuallyadditions.mod.items.lens.LensMining; -import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; -import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; -import de.ellpeck.actuallyadditions.mod.material.InitArmorMaterials; -import de.ellpeck.actuallyadditions.mod.material.InitToolMaterials; -import de.ellpeck.actuallyadditions.mod.misc.BannerHelper; -import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.LaserRelayConnectionHandler; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.MethodHandler; -import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -import de.ellpeck.actuallyadditions.mod.proxy.IProxy; -import de.ellpeck.actuallyadditions.mod.recipe.EmpowererHandler; -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.compat.CompatUtil; +import de.ellpeck.actuallyadditions.booklet.InitBooklet; +import de.ellpeck.actuallyadditions.common.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.common.crafting.CrusherCrafting; +import de.ellpeck.actuallyadditions.common.data.WorldData; +import de.ellpeck.actuallyadditions.common.entity.InitEntities; +import de.ellpeck.actuallyadditions.common.event.CommonEvents; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.gen.AAWorldGen; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.items.ItemCoffee; +import de.ellpeck.actuallyadditions.common.items.lens.LensMining; +import de.ellpeck.actuallyadditions.common.items.lens.LensRecipeHandler; +import de.ellpeck.actuallyadditions.common.items.lens.Lenses; +import de.ellpeck.actuallyadditions.common.material.InitArmorMaterials; +import de.ellpeck.actuallyadditions.common.material.InitToolMaterials; +import de.ellpeck.actuallyadditions.common.misc.BannerHelper; +import de.ellpeck.actuallyadditions.common.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.LaserRelayConnectionHandler; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.MethodHandler; +import de.ellpeck.actuallyadditions.common.network.PacketHandler; +import de.ellpeck.actuallyadditions.common.proxy.IProxy; +import de.ellpeck.actuallyadditions.common.recipe.EmpowererHandler; +import de.ellpeck.actuallyadditions.common.recipe.HairyBallHandler; +import de.ellpeck.actuallyadditions.common.recipe.TreasureChestHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.update.UpdateChecker; +import de.ellpeck.actuallyadditions.common.util.compat.CompatUtil; import net.minecraft.launchwrapper.Launch; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; @@ -55,14 +55,14 @@ public class ActuallyAdditions { public static final String MODID = ActuallyAdditionsAPI.MOD_ID; public static final String NAME = "Actually Additions"; public static final String VERSION = "@VERSION@"; - public static final String GUIFACTORY = "de.ellpeck.actuallyadditions.mod.config.GuiFactory"; + public static final String GUIFACTORY = "de.ellpeck.actuallyadditions.common.config.GuiFactory"; public static final String DEPS = "required:forge@[14.23.5.2836,);before:craftingtweaks;after:fastbench@[1.3.2,)"; public static final boolean DEOBF = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); @Instance public static ActuallyAdditions INSTANCE; - @SidedProxy(clientSide = "de.ellpeck.actuallyadditions.mod.proxy.ClientProxy", serverSide = "de.ellpeck.actuallyadditions.mod.proxy.ServerProxy") + @SidedProxy(clientSide = "de.ellpeck.actuallyadditions.common.proxy.ClientProxy", serverSide = "de.ellpeck.actuallyadditions.common.proxy.ServerProxy") public static IProxy PROXY; public static final Logger LOGGER = LogManager.getLogger(NAME); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/ClientRegistryHandler.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/ClientRegistryHandler.java index 15401d56a..0af2b1e7a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/ClientRegistryHandler.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod; +package de.ellpeck.actuallyadditions.common; import java.util.HashMap; import java.util.Map; -import de.ellpeck.actuallyadditions.mod.blocks.render.ActualCompostModel; -import de.ellpeck.actuallyadditions.mod.blocks.render.CompostModel; -import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.util.FluidStateMapper; +import de.ellpeck.actuallyadditions.common.blocks.render.ActualCompostModel; +import de.ellpeck.actuallyadditions.common.blocks.render.CompostModel; +import de.ellpeck.actuallyadditions.common.blocks.render.IHasModel; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.util.FluidStateMapper; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/RegistryHandler.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/RegistryHandler.java index 0f4ed0d25..4d390b4e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/RegistryHandler.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod; +package de.ellpeck.actuallyadditions.common; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting; -import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.misc.SoundHandler; -import de.ellpeck.actuallyadditions.mod.ore.InitOreDict; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.crafting.InitCrafting; +import de.ellpeck.actuallyadditions.common.gen.village.InitVillager; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.misc.SoundHandler; +import de.ellpeck.actuallyadditions.common.ore.InitOreDict; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java rename to src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java index 970a48aed..67359f588 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/achievement/InitAchievements.java @@ -1,8 +1,8 @@ //TODO Achievements -> Advancements? /* -package de.ellpeck.actuallyadditions.mod.achievement; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +package de.ellpeck.actuallyadditions.achievement; +import de.ellpeck.actuallyadditions.util.ModUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/common/achievement/TheAchievements.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java rename to src/main/java/de/ellpeck/actuallyadditions/common/achievement/TheAchievements.java index 76e72ad84..835386799 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/achievement/TheAchievements.java @@ -1,13 +1,13 @@ //TODO Fix achievements /* -package de.ellpeck.actuallyadditions.mod.achievement; +package de.ellpeck.actuallyadditions.common.achievement; -import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements.Type; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.achievement.InitAchievements.Type; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.util.ModUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java index fb785ee5c..01d3486f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockAtomicReconstructor.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; import de.ellpeck.actuallyadditions.api.lens.ILensItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; @@ -40,7 +40,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ToolType; -import javax.annotation.Nullable; import java.util.List; public class BlockAtomicReconstructor extends BlockContainerBase implements IHudDisplay { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java index d08528a25..4a340b19b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBatteryBox.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.items.ItemBattery; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.items.ItemBattery; +import de.ellpeck.actuallyadditions.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java index 7622898fe..a6912f3d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityBioReactor; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBlackLotus.java similarity index 77% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBlackLotus.java index c94512c42..0a5193b04 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBlackLotus.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockBushBase; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraftforge.common.ToolType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java index eb4ae741b..c744f8f77 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.tile.TileEntityPlacer; +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.tile.TileEntityPlacer; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java index 013d52cee..3821954a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java index 93f6e46b6..dfe42276a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoalGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java index 87281c55b..c6426ac85 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCoffeeMachine.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java index da980d3e4..512fc62e8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockColoredLamp.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java index 683ba1bbe..477ec727b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java index 6f50ff7c2..b8b17984e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystal.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java index e343461cd..6a0fe1a83 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCrystalCluster.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingBlock; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.util.IColorProvidingBlock; +import de.ellpeck.actuallyadditions.util.IColorProvidingItem; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java index c0e2dabce..9e7a467a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDirectionalBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java index bd85e655e..e2ee15ef2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDisplayStand.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDropper.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDropper.java index 2e647a6b5..7dd45742e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockDropper.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -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.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDropper; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEmpowerer.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEmpowerer.java index 81bdecc01..97b7ae2d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEmpowerer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEmpowerer; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java index 07516b4dc..f04c7f32b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockEnergizer.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.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 net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFarmer.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFarmer.java index 35be35db1..2027a9e29 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFarmer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -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.TileEntityFarmer; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFarmer; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java index ef8f3f29d..067357058 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFeeder.java @@ -1,16 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityFeeder; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java index 8109f3906..ea39a0b7e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFermentingBarrel.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java index 5e6df17db..4f474e6cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFireworkBox.java @@ -1,15 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.TileEntityFireworkBox; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityFireworkBox; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java index 6a2f5a816..9be3851bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFishingNet.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFishingNet; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFishingNet; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java index 46b66012d..c0253dbfd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFluidCollector.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.tile.TileEntityFluidPlacer; +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.tile.TileEntityFluidPlacer; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java index 58fd8e8b5..68e66025d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceDouble.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java index f223d30e0..e5fbbec98 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockFurnaceSolar.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceSolar; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java index a58c55a61..47397876b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGeneric.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGiantChest.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGiantChest.java index ed5b70ff5..d11f990e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGiantChest.java @@ -1,18 +1,18 @@ // todo: delete. I'm not allowed to port this one haha -//package de.ellpeck.actuallyadditions.mod.blocks; +//package de.ellpeck.actuallyadditions.common.blocks; // -//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.items.InitItems; -//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; -//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestLarge; -//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestMedium; -//import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -//import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -//import de.ellpeck.actuallyadditions.mod.util.StackUtil; -//import de.ellpeck.actuallyadditions.mod.util.StringUtil; +//import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +//import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +//import de.ellpeck.actuallyadditions.common.blocks.base.ItemBlockBase; +//import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +//import de.ellpeck.actuallyadditions.common.items.InitItems; +//import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChest; +//import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChestLarge; +//import de.ellpeck.actuallyadditions.common.tile.TileEntityGiantChestMedium; +//import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +//import de.ellpeck.actuallyadditions.common.util.ItemUtil; +//import de.ellpeck.actuallyadditions.common.util.StackUtil; +//import de.ellpeck.actuallyadditions.common.util.StringUtil; //import net.minecraft.block.Block; //import net.minecraft.block.SoundType; //import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java index 3afa312a2..4ba932e9a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGreenhouseGlass.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGrinder.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGrinder.java index aabff23a8..bd994e2ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockGrinder.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -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.TileEntityGrinder; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinderDouble; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.common.tile.TileEntityGrinderDouble; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java index 7092e92aa..454d6f3e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockHeatCollector.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityHeatCollector; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityHeatCollector; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java index 28f70faf5..da74f26fe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockInputter.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputterAdvanced; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInputterAdvanced; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemRepairer.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemRepairer.java index 12450f9e0..3f177048b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemRepairer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -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.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemRepairer; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java index db83dfe6a..53c0f2b14 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewer.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewer; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityItemViewer; import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewerHopping.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewerHopping.java index 476bc44f1..eea36da42 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockItemViewerHopping.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import java.util.List; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewerHopping; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemViewerHopping; import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLampPowerer.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLampPowerer.java index 691a13fba..34239c323 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLampPowerer.java @@ -1,7 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java index 7f22177c4..758ce2a0c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLaserRelay.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.config.ConfigValues; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.items.ItemEngineerGoggles; -import de.ellpeck.actuallyadditions.mod.items.ItemLaserRelayUpgrade; -import de.ellpeck.actuallyadditions.mod.items.ItemLaserWrench; -import de.ellpeck.actuallyadditions.mod.tile.*; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.config.ConfigValues; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.items.ItemEngineerGoggles; +import de.ellpeck.actuallyadditions.items.ItemLaserRelayUpgrade; +import de.ellpeck.actuallyadditions.items.ItemLaserWrench; +import de.ellpeck.actuallyadditions.tile.*; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java index e48cbf377..ddb0d9350 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLavaFactoryController.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLavaFactoryController; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityLavaFactoryController; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java similarity index 74% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java index 5dd191004..2dae083b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockLeafGenerator.java @@ -1,11 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLeafGenerator; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityLeafGenerator; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java index 2749ceab8..d39567444 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMiner.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.StringUtil; +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.StringUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java index 75a360f3a..bf5475ddf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockMisc.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockOilGenerator.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockOilGenerator.java index 6c849eb62..00e6d2d31 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockOilGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -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.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityOilGenerator; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java index 9b3601742..198bfe763 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantom.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; 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.tile.*; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.*; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java index 892efd95d..a9118e31f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPhantomBooster.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomBooster; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityPhantomBooster; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java index 967bf22ef..8c9e2113f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockPlayerInterface.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlayerInterface; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityPlayerInterface; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java index cb92931ab..8635db572 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockRangedCollector.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java index 2a3101a99..199a8fced 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockShockSuppressor.java @@ -1,17 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityShockSuppressor; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.tile.TileEntityShockSuppressor; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.ToolType; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java index 4c4f23995..6e12bfd70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSlabs.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java index c831070d3..e04e9b884 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockSmileyCloud.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -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.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java index a711811b2..18819d225 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTinyTorch.java @@ -1,16 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; import net.minecraft.block.SoundType; -import net.minecraft.block.TorchBlock; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.state.DirectionProperty; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTreasureChest.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTreasureChest.java index 19d5b92c4..78c310d90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockTreasureChest.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWallAA.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWallAA.java index e1b312d05..a73465c05 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWallAA.java @@ -1,10 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockWall; -import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -16,7 +14,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ToolType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java index b8ca097f0..5c2f4412c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockWildPlant.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockBushBase; +import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockXPSolidifier.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockXPSolidifier.java index 7af201c2e..a32dcff13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockXPSolidifier.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.common.blocks; -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.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.tile.TileEntityXPSolidifier; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java index 43af344f7..5c842e942 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/IHudDisplay.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; @@ -8,8 +8,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; - public interface IHudDisplay { @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java index 305889246..3954c427f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InitBlocks.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.blocks; +package de.ellpeck.actuallyadditions.blocks; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; import net.minecraft.block.Block; import net.minecraft.block.StairsBlock; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java index 33b87c5dc..dc5ecb1b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBase.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java index bf18f9e0b..a3d3a41a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockBushBase.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; import net.minecraft.block.BushBlock; import net.minecraft.block.SoundType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java index 325ec4a12..b602fb9b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockContainerBase.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.ConfigValues; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.ConfigValues; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityInventoryBase; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MoverType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java index 74fff3313..88e0509f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockFluidFlowing.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; import net.minecraft.block.Block; import net.minecraft.block.FlowingFluidBlock; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockItemBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java index 3d630ea66..aa20febda 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockItemBase.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java index 14980a227..4f31a71e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockPlant.java @@ -8,9 +8,9 @@ * © 2015-2017 Ellpeck */ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.BlockState; import net.minecraft.block.CropsBlock; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java index d77029fa0..efc5ab2fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/BlockStair.java @@ -1,8 +1,8 @@ -//package de.ellpeck.actuallyadditions.mod.blocks.base; +//package de.ellpeck.actuallyadditions.blocks.base; // -//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; -//import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +//import de.ellpeck.actuallyadditions.ActuallyAdditions; +//import de.ellpeck.actuallyadditions.blocks.render.IHasModel; +//import de.ellpeck.actuallyadditions.util.ItemUtil; //import net.minecraft.block.Block; //import net.minecraft.block.BlockStairs; //import net.minecraft.block.BlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/IBaseBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/IBaseBlock.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java index 7c32ef59c..b22aef0f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/IBaseBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/base/IBaseBlock.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.base; +package de.ellpeck.actuallyadditions.blocks.base; import net.minecraft.item.Rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java index 57bf07393..f6927690a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheColoredLampColors.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.metalists; +package de.ellpeck.actuallyadditions.blocks.metalists; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java index cf1f0e2bb..a62a3286a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheMiscBlocks.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.metalists; +package de.ellpeck.actuallyadditions.blocks.metalists; import net.minecraft.item.Rarity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java index 3b57c83d4..48ae50da2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/metalists/TheWildPlants.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.blocks.metalists; +package de.ellpeck.actuallyadditions.blocks.metalists; import com.google.common.base.Preconditions; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.item.Rarity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java index dd443958a..8e576e986 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/ActualCompostModel.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; -import de.ellpeck.actuallyadditions.mod.blocks.BlockCompost; +import de.ellpeck.actuallyadditions.blocks.BlockCompost; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java index 7f8f830d4..4d0e6a5ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/CompostModel.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java similarity index 59% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java index d7137e212..1cc39f8fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/IHasModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/IHasModel.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; @Deprecated public interface IHasModel { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java index 6bfe9caf0..b3f4f01b8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderBatteryBox.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.ItemBattery; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.ItemBattery; +import de.ellpeck.actuallyadditions.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java index e89e4bee8..817b8830d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderDisplayStand.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java index e235d7fb3..01cab58d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderEmpowerer.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.tile.TileEntityEmpowerer; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java index c1fb22936..be1d71434 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderLaserRelay.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; -import de.ellpeck.actuallyadditions.mod.config.ConfigValues; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.ItemEngineerGoggles; -import de.ellpeck.actuallyadditions.mod.items.ItemLaserWrench; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.config.ConfigValues; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.ItemEngineerGoggles; +import de.ellpeck.actuallyadditions.items.ItemLaserWrench; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java index 4ef7a1bc0..1447529a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderReconstructorLens.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; import de.ellpeck.actuallyadditions.api.lens.ILensItem; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderSmileyCloud.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderSmileyCloud.java index d275c8893..dc4945ce8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/RenderSmileyCloud.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.common.blocks.render; import com.mojang.blaze3d.matrix.MatrixStack; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg; -import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs; -import de.ellpeck.actuallyadditions.mod.misc.special.RenderSpecial; -import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; -import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.misc.cloud.ISmileyCloudEasterEgg; +import de.ellpeck.actuallyadditions.common.misc.cloud.SmileyCloudEasterEggs; +import de.ellpeck.actuallyadditions.common.misc.special.RenderSpecial; +import de.ellpeck.actuallyadditions.common.misc.special.SpecialRenderInit; +import de.ellpeck.actuallyadditions.common.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalBlock; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/Transformer.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/Transformer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java index d6f7a9247..f181c94a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/Transformer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/render/Transformer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.blocks.render; +package de.ellpeck.actuallyadditions.blocks.render; //public class Transformer extends VertexTransformer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java index c8404ff4b..1e0d7e303 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigCategories.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.config; +package de.ellpeck.actuallyadditions.config; import java.util.Locale; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java index 0344efd2e..28e86924c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigValues.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.config; +package de.ellpeck.actuallyadditions.config; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java index 6230d5051..b2a56adbf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/ConfigurationHandler.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.config; +package de.ellpeck.actuallyadditions.config; import java.io.File; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.client.event.ConfigChangedEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java index 1f5f5b068..6f3ad4ec2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiConfiguration.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.config; +package de.ellpeck.actuallyadditions.config; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.config.GuiConfig; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java index 6eccf07c0..d161ae5eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/GuiFactory.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.config; +package de.ellpeck.actuallyadditions.config; import java.util.Set; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java index 1e54e2241..d42f88e86 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigBoolValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.config.values; +package de.ellpeck.actuallyadditions.config.values; -import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; +import de.ellpeck.actuallyadditions.config.ConfigCategories; public enum ConfigBoolValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntListValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntListValues.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java index d627ae388..d7ca3377b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntListValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntListValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.config.values; +package de.ellpeck.actuallyadditions.config.values; -import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; +import de.ellpeck.actuallyadditions.config.ConfigCategories; public enum ConfigIntListValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java index c241e7ec4..45d0896eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigIntValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.config.values; +package de.ellpeck.actuallyadditions.config.values; -import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; +import de.ellpeck.actuallyadditions.config.ConfigCategories; public enum ConfigIntValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java rename to src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java index fd7581687..ec0201a4e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/config/values/ConfigStringListValues.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.config.values; +package de.ellpeck.actuallyadditions.config.values; -import de.ellpeck.actuallyadditions.mod.config.ConfigCategories; +import de.ellpeck.actuallyadditions.config.ConfigCategories; public enum ConfigStringListValues { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java index 5c2aeb98c..16ca8468a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/BlockCrafting.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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.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.RecipeUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +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.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.RecipeUtil; +import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java index 5aba0fb81..c39e547d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.mod.util.RecipeUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.util.RecipeUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; 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/FoodCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java index de881188d..0a0c2146b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/FoodCrafting.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; -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.RecipeUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +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.RecipeUtil; +import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; 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/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java similarity index 70% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java index 7bb6cbee7..ce60d5b65 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/InitCrafting.java @@ -1,18 +1,18 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.CactusFarmerBehavior; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.DefaultFarmerBehavior; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.MelonPumpkinFarmerBehavior; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.NetherWartFarmerBehavior; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.ReedFarmerBehavior; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu.EnderlillyFarmerBehavior; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu.RedOrchidFarmerBehavior; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.fluids.InitFluids; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.CactusFarmerBehavior; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.DefaultFarmerBehavior; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.MelonPumpkinFarmerBehavior; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.NetherWartFarmerBehavior; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.ReedFarmerBehavior; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu.EnderlillyFarmerBehavior; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu.RedOrchidFarmerBehavior; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java index cbd7721c1..bf484f229 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ItemCrafting.java @@ -1,21 +1,21 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; import java.util.ArrayList; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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.values.ConfigBoolValues; -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.items.metalists.ThePotionRings; -import de.ellpeck.actuallyadditions.mod.util.RecipeUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +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.values.ConfigBoolValues; +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.items.metalists.ThePotionRings; +import de.ellpeck.actuallyadditions.util.RecipeUtil; +import de.ellpeck.actuallyadditions.util.Util; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; import net.minecraft.enchantment.EnchantmentData; import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/MiscCrafting.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/MiscCrafting.java index f076c81a3..d2de846a5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/MiscCrafting.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -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.RecipeUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.common.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.RecipeUtil; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler; 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/mod/crafting/RecipeBioMash.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeBioMash.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeBioMash.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeBioMash.java index 70c8adf81..15dda6320 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeBioMash.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeBioMash.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.common.crafting; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.ItemKnife; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemKnife; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java index b859b20cc..a8800eb67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShaped.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java index 74300bca2..d9361b3f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipeKeepDataShapeless.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java index 1eacee937..cf54471bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipePotionRingCharging.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/RecipePotionRingCharging.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; -import de.ellpeck.actuallyadditions.mod.items.ItemPotionRing; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHelper; +import de.ellpeck.actuallyadditions.items.ItemPotionRing; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHelper; import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java index 870b3cc03..9fedd423c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/ToolCrafting.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.crafting; +package de.ellpeck.actuallyadditions.crafting; import java.util.ArrayList; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.mod.util.RecipeUtil; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.util.RecipeUtil; +import de.ellpeck.actuallyadditions.util.crafting.RecipeHandler; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java rename to src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java index 20c79ba16..d012da69d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/creative/CreativeTab.java @@ -1,11 +1,11 @@ // todo: reimplement this the normal 1.14+ -//package de.ellpeck.actuallyadditions.mod.creative; +//package de.ellpeck.actuallyadditions.creative; // //import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -//import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -//import de.ellpeck.actuallyadditions.mod.items.InitItems; +//import de.ellpeck.actuallyadditions.ActuallyAdditions; +//import de.ellpeck.actuallyadditions.blocks.InitBlocks; +//import de.ellpeck.actuallyadditions.fluids.InitFluids; +//import de.ellpeck.actuallyadditions.items.InitItems; //import net.minecraft.block.Block; //import net.minecraft.creativetab.CreativeTabs; //import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java b/src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java rename to src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java index a3592afbd..d221c0d13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/data/PlayerData.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.data; +package de.ellpeck.actuallyadditions.common.data; import java.util.ArrayList; import java.util.List; @@ -6,8 +6,8 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java rename to src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java index 60b5d36c6..1a371b80b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/data/WorldData.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.data; +package de.ellpeck.actuallyadditions.data; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.LaserRelayConnectionHandler; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.misc.apiimpl.LaserRelayConnectionHandler; 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/mod/entity/EntityWorm.java b/src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityWorm.java rename to src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java index a09a7d403..ecb7bcace 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/entity/EntityWorm.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.entity; +package de.ellpeck.actuallyadditions.entity; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.DefaultFarmerBehavior; +import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.misc.apiimpl.farmer.DefaultFarmerBehavior; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java b/src/main/java/de/ellpeck/actuallyadditions/common/entity/InitEntities.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java rename to src/main/java/de/ellpeck/actuallyadditions/common/entity/InitEntities.java index 29d407984..40b7c2f9e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/entity/InitEntities.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.entity; +package de.ellpeck.actuallyadditions.common.entity; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java b/src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java rename to src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java index e1b2c6d61..a1b0106ba 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/entity/RenderWorm.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.entity; +package de.ellpeck.actuallyadditions.entity; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java rename to src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java index 866f3a8a9..b6530bf4e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/event/ClientEvents.java @@ -1,20 +1,20 @@ -package de.ellpeck.actuallyadditions.mod.event; +package de.ellpeck.actuallyadditions.event; import java.util.Locale; import com.mojang.blaze3d.platform.GlStateManager; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.IHudDisplay; -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.data.WorldData; -import de.ellpeck.actuallyadditions.mod.inventory.gui.EnergyDisplay; -import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats; -import de.ellpeck.actuallyadditions.mod.tile.IEnergyDisplay; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.IHudDisplay; +import de.ellpeck.actuallyadditions.config.ConfigValues; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.data.WorldData; +import de.ellpeck.actuallyadditions.inventory.gui.EnergyDisplay; +import de.ellpeck.actuallyadditions.items.ItemWingsOfTheBats; +import de.ellpeck.actuallyadditions.tile.IEnergyDisplay; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; 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/mod/event/CommonEvents.java b/src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java rename to src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java index bbf8dc2cd..3dd85b292 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/event/CommonEvents.java @@ -1,21 +1,21 @@ -package de.ellpeck.actuallyadditions.mod.event; +package de.ellpeck.actuallyadditions.event; import java.util.Locale; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.data.WorldData; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerBag; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.ItemBag; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.data.PlayerData; +import de.ellpeck.actuallyadditions.data.WorldData; +import de.ellpeck.actuallyadditions.inventory.ContainerBag; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.ItemBag; +import de.ellpeck.actuallyadditions.items.ItemDrill; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.FilterSettings; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntitySpider; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java index 554ab193b..8a29b3a6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/FluidAA.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.fluids; +package de.ellpeck.actuallyadditions.fluids; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java rename to src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java index 0cfbf959c..46c48e86b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/fluids/InitFluids.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.fluids; +package de.ellpeck.actuallyadditions.fluids; import java.util.Locale; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockFluidFlowing; +import de.ellpeck.actuallyadditions.blocks.base.BlockFluidFlowing; 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/mod/gen/AAWorldGen.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/AAWorldGen.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java index b8a3af62e..a3e62ed69 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/AAWorldGen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/AAWorldGen.java @@ -1,20 +1,20 @@ -package de.ellpeck.actuallyadditions.mod.gen; +package de.ellpeck.actuallyadditions.gen; import java.util.ArrayList; import java.util.Random; import org.apache.commons.lang3.ArrayUtils; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.BlockMisc; -import de.ellpeck.actuallyadditions.mod.blocks.BlockWildPlant; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.BlockMisc; +import de.ellpeck.actuallyadditions.blocks.BlockWildPlant; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java index c2221b1b3..87877e190 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/WorldGenLushCaves.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.gen; +package de.ellpeck.actuallyadditions.gen; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/BasicTradeList.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/BasicTradeList.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/BasicTradeList.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/BasicTradeList.java index 6b2cb1f01..7820c1a98 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/BasicTradeList.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/BasicTradeList.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.gen.village; +package de.ellpeck.actuallyadditions.common.gen.village; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/InitVillager.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/InitVillager.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java index ddf1516b7..2aaf9752e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/InitVillager.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/InitVillager.java @@ -1,19 +1,19 @@ -package de.ellpeck.actuallyadditions.mod.gen.village; +package de.ellpeck.actuallyadditions.gen.village; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentCustomCropField; -import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentEngineerHouse; -import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentJamHouse; -import de.ellpeck.actuallyadditions.mod.gen.village.component.handler.VillageCustomCropFieldHandler; -import de.ellpeck.actuallyadditions.mod.gen.village.component.handler.VillageEngineerHouseHandler; -import de.ellpeck.actuallyadditions.mod.gen.village.component.handler.VillageJamHouseHandler; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentCustomCropField; +import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentEngineerHouse; +import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentJamHouse; +import de.ellpeck.actuallyadditions.gen.village.component.handler.VillageCustomCropFieldHandler; +import de.ellpeck.actuallyadditions.gen.village.component.handler.VillageEngineerHouseHandler; +import de.ellpeck.actuallyadditions.gen.village.component.handler.VillageJamHouseHandler; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; +import de.ellpeck.actuallyadditions.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.entity.passive.EntityVillager.PriceInfo; import net.minecraft.item.ItemStack; import net.minecraft.world.gen.structure.MapGenStructureIO; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java index e34d56df1..478f19c6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentCustomCropField.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.gen.village.component; +package de.ellpeck.actuallyadditions.gen.village.component; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java index 5563e7b75..a2676381a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentEngineerHouse.java @@ -1,29 +1,29 @@ -package de.ellpeck.actuallyadditions.mod.gen.village.component; +package de.ellpeck.actuallyadditions.gen.village.component; import java.util.List; import java.util.Random; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.LaserType; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.BlockColoredLamp; -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.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.BlockColoredLamp; +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.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.fluids.InitFluids; +import de.ellpeck.actuallyadditions.gen.village.InitVillager; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergy; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java index 415cc7e1b..9719a0411 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/VillageComponentJamHouse.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.gen.village.component; +package de.ellpeck.actuallyadditions.gen.village.component; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager; -import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.gen.village.InitVillager; +import de.ellpeck.actuallyadditions.misc.DungeonLoot; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.BlockLeaves; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java index 69964d322..8147bc5b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageCustomCropFieldHandler.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.gen.village.component.handler; +package de.ellpeck.actuallyadditions.gen.village.component.handler; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentCustomCropField; +import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentCustomCropField; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java index 8e88d7b4a..fd3edeb6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageEngineerHouseHandler.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.gen.village.component.handler; +package de.ellpeck.actuallyadditions.gen.village.component.handler; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentEngineerHouse; +import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentEngineerHouse; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java index 8b6da2e6a..431838404 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/gen/village/component/handler/VillageJamHouseHandler.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.gen.village.component.handler; +package de.ellpeck.actuallyadditions.gen.village.component.handler; import java.util.List; import java.util.Random; -import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentJamHouse; +import de.ellpeck.actuallyadditions.gen.village.component.VillageComponentJamHouse; import net.minecraft.util.EnumFacing; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java index 74eac002e..742feede5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBag.java @@ -1,22 +1,22 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotDeletion; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.items.ItemBag; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.inventory.slot.SlotDeletion; +import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.items.ItemBag; +import de.ellpeck.actuallyadditions.items.ItemDrill; +import de.ellpeck.actuallyadditions.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.tile.FilterSettings; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java index 326706dda..e523afca7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBioReactor.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityBioReactor; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java index 279d0e5f4..47f97b8f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java index 991b141d8..cc76e9c23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCanolaPress.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -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 de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +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.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java index 762050690..dbdb2af3a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoalGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -72,6 +72,4 @@ public class ContainerCoalGenerator extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - return this.generator.canPlayerUse(player); - } -} \ No newline at end of file + return this.genera \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java index 44b6a5a03..9ba0a0c7d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerCoffeeMachine.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -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 de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +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.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java index f3a9339ff..baef1da4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDirectionalBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -73,6 +73,4 @@ public class ContainerDirectionalBreaker extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - return this.breaker.canPlayerUse(player); - } -} \ No newline at end of file + return this.brea \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java index 39cf7754a..d1e83d4b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDrill.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.items.ItemDrill; +import de.ellpeck.actuallyadditions.items.ItemDrillUpgrade; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java index 189d5b5a5..41021bf27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerDropper.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityDropper; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnergizer.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnergizer.java index cdaa4b46d..edc8093b3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnergizer.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java index 5cc445505..812c9eca0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerEnervator.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFarmer.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFarmer.java index 3871da5dc..a9e3a286d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFarmer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFarmer; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFeeder.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFeeder.java index 9348478d3..551979794 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFeeder.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFeeder; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java index 9145a4647..29d811100 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFermentingBarrel.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java index 2cf89cce8..f5c2e06be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFilter.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.inventory.slot.SlotImmovable; +import de.ellpeck.actuallyadditions.items.ItemDrill; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java index dba099844..c8f36145a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFireworkBox.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFluidCollector.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFluidCollector.java index ef6e4bd41..6f5339a58 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFluidCollector.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java index 7adf2d6d1..f43cf62ec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerFurnaceDouble.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java index 6c4024a52..c0978ab45 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGiantChest.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.util.StackUtil; 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/mod/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java index a23992b1f..caade7123 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerGrinder.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -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 de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +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.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java index eedd7838f..3fda08dde 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerInputter.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter; +import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerLaserRelayItemWhitelist.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerLaserRelayItemWhitelist.java index 8e1a86092..c840ca153 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerLaserRelayItemWhitelist.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java index 996ae8340..035833cf3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerMiner.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityMiner; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java index 3b4e63e7a..80ec33944 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerOilGenerator.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerPhantomPlacer.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerPhantomPlacer.java index 42da40777..7359d1d06 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerPhantomPlacer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java index ef3fc39a9..cc6b2086f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRangedCollector.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java index 7d47c8d50..51b6f8729 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerRepairer.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java index a59bce53f..933729263 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerSmileyCloud.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java index d6617069b..39c133df5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/ContainerXPSolidifier.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.items.ItemSolidifiedExperience; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.inventory.slot.SlotItemHandlerUnconditioned; +import de.ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import de.ellpeck.actuallyadditions.items.ItemSolidifiedExperience; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiFireworkBox.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiFireworkBox.java index 4a09fe286..869c17e5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiFireworkBox.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.common.inventory; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityFireworkBox; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiPageButtonList.GuiResponder; import net.minecraft.client.gui.GuiSlider; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java index cf195f874..6d19cfcbd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/GuiHandler.java @@ -1,41 +1,41 @@ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.inventory; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiMainPage; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiBag; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiBioReactor; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiBreaker; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCanolaPress; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCoalGenerator; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiDirectionalBreaker; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiDrill; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiDropper; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiEnergizer; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiEnervator; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFarmer; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFeeder; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFermentingBarrel; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFilter; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFluidCollector; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiGiantChest; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiGrinder; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiMiner; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiOilGenerator; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiPhantomPlacer; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiRangedCollector; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiRepairer; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiSmileyCloud; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiXPSolidifier; -import de.ellpeck.actuallyadditions.mod.items.ItemBooklet; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.util.compat.CompatUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.booklet.gui.GuiMainPage; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.data.PlayerData; +import de.ellpeck.actuallyadditions.inventory.gui.GuiBag; +import de.ellpeck.actuallyadditions.inventory.gui.GuiBioReactor; +import de.ellpeck.actuallyadditions.inventory.gui.GuiBreaker; +import de.ellpeck.actuallyadditions.inventory.gui.GuiCanolaPress; +import de.ellpeck.actuallyadditions.inventory.gui.GuiCoalGenerator; +import de.ellpeck.actuallyadditions.inventory.gui.GuiCoffeeMachine; +import de.ellpeck.actuallyadditions.inventory.gui.GuiDirectionalBreaker; +import de.ellpeck.actuallyadditions.inventory.gui.GuiDrill; +import de.ellpeck.actuallyadditions.inventory.gui.GuiDropper; +import de.ellpeck.actuallyadditions.inventory.gui.GuiEnergizer; +import de.ellpeck.actuallyadditions.inventory.gui.GuiEnervator; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFarmer; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFeeder; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFermentingBarrel; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFilter; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFluidCollector; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFurnaceDouble; +import de.ellpeck.actuallyadditions.inventory.gui.GuiGiantChest; +import de.ellpeck.actuallyadditions.inventory.gui.GuiGrinder; +import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter; +import de.ellpeck.actuallyadditions.inventory.gui.GuiLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.inventory.gui.GuiMiner; +import de.ellpeck.actuallyadditions.inventory.gui.GuiOilGenerator; +import de.ellpeck.actuallyadditions.inventory.gui.GuiPhantomPlacer; +import de.ellpeck.actuallyadditions.inventory.gui.GuiRangedCollector; +import de.ellpeck.actuallyadditions.inventory.gui.GuiRepairer; +import de.ellpeck.actuallyadditions.inventory.gui.GuiSmileyCloud; +import de.ellpeck.actuallyadditions.inventory.gui.GuiXPSolidifier; +import de.ellpeck.actuallyadditions.items.ItemBooklet; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.util.compat.CompatUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java index ffe276f96..f0b263073 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/EnergyDisplay.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.tile.CustomEnergyStorage; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.tile.CustomEnergyStorage; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java index 749b0e1bf..e97dfd633 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FilterSettingsGui.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter.SmallerButton; -import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.gui.GuiInputter.SmallerButton; +import de.ellpeck.actuallyadditions.tile.FilterSettings; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java index 299695be5..94b3a14c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/FluidDisplay.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.text.NumberFormat; import java.util.Collections; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java index 0d452d29d..7262add5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBag.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerBag; -import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer; -import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerBag; +import de.ellpeck.actuallyadditions.network.PacketClientToServer; +import de.ellpeck.actuallyadditions.network.PacketHandler; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java index 0193b82a9..be05276d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBioReactor.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerBioReactor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.inventory.ContainerBioReactor; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityBioReactor; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java index 469e99534..1a5df69d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 de.ellpeck.actuallyadditions.inventory.ContainerBreaker; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityBreaker; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java index 28d59b94b..cc500c879 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCanolaPress.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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.inventory.ContainerCanolaPress; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java index 360804585..5eac61e92 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoalGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 de.ellpeck.actuallyadditions.inventory.ContainerCoalGenerator; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java index a6378259e..361969a39 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiCoffeeMachine.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.util.Collections; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -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.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerCoffeeMachine; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java index e84c3f1d5..691aebab5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDirectionalBreaker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 de.ellpeck.actuallyadditions.inventory.ContainerDirectionalBreaker; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java index 183d4dfe4..a064938a3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDrill.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerDrill; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerDrill; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDropper.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDropper.java index 5ca700be9..e24c2a1d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiDropper.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; -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 de.ellpeck.actuallyadditions.common.inventory.ContainerDropper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityDropper; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java index f7cffe1e2..ceec9052e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnergizer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 de.ellpeck.actuallyadditions.inventory.ContainerEnergizer; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java index 247310a8d..8fc8d3ea0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiEnervator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 de.ellpeck.actuallyadditions.inventory.ContainerEnervator; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityEnervator; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java index e9c9a30ce..5a2d14c0c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFarmer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerFarmer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.inventory.ContainerFarmer; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFarmer; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java index 7c6826a31..bbb1b9afc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFeeder.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.util.Arrays; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +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.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java index e4d71f0ce..b9d59d184 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFermentingBarrel.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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.inventory.ContainerFermentingBarrel; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java index 7a92af529..6a568b3f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFilter.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerFilter; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java index 575d3fe29..806a865b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFluidCollector.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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.inventory.ContainerFluidCollector; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java index b9051d859..0e6272ef5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiFurnaceDouble.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; import java.util.Collections; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerFurnaceDouble; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java index 6df4f2bce..0e55109d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGiantChest.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestLarge; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestMedium; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.inventory.ContainerGiantChest; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChestLarge; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChestMedium; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java index 1e6a3c861..8509beaf7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiGrinder.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; import java.util.Collections; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerGrinder; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerGrinder; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityGrinder; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java index a79973612..966daf76a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiInputter.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; import org.lwjgl.input.Keyboard; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerInputter; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -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.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerInputter; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityInputter; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.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/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiLaserRelayItemWhitelist.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiLaserRelayItemWhitelist.java index 2bcf18d50..119530c11 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.common.inventory.gui; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter.SmallerButton; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.ContainerLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.common.inventory.gui.GuiInputter.SmallerButton; +import de.ellpeck.actuallyadditions.common.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java index 361aa8f96..d0ac44d92 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiMiner.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -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 de.ellpeck.actuallyadditions.inventory.ContainerMiner; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +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 net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java index acf2756ee..7b1f1a46a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiOilGenerator.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 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 net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java index 453325721..f418ef460 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiPhantomPlacer.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerPhantomPlacer; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerPhantomPlacer; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityPhantomPlacer; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java index 4d3fb9a32..6e7b95f47 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRangedCollector.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerRangedCollector; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -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.inventory.ContainerRangedCollector; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java index e2567ca7f..351a05644 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiRepairer.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -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 de.ellpeck.actuallyadditions.inventory.ContainerRepairer; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java index eebe24d24..e5325e522 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiSmileyCloud.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.io.IOException; import org.lwjgl.input.Keyboard; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerSmileyCloud; -import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer; -import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -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.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerSmileyCloud; +import de.ellpeck.actuallyadditions.network.PacketClientToServer; +import de.ellpeck.actuallyadditions.network.PacketHandler; +import de.ellpeck.actuallyadditions.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java index 59067a845..14266b1d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiWtfMojang.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java index 796fe8efb..7bb3e1045 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/GuiXPSolidifier.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerXPSolidifier; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -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 de.ellpeck.actuallyadditions.inventory.ContainerXPSolidifier; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java index 49c80933c..7c69b7350 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/gui/TexturedButton.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.inventory.gui; +package de.ellpeck.actuallyadditions.inventory.gui; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotDeletion.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java similarity index 72% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotDeletion.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java index fbca33147..99b8c113a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotDeletion.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotDeletion.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.inventory.slot; +package de.ellpeck.actuallyadditions.inventory.slot; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; import net.minecraft.item.ItemStack; public class SlotDeletion extends SlotItemHandlerUnconditioned { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java index f7f6d162c..2836d23b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotFilter.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.inventory.slot; +package de.ellpeck.actuallyadditions.inventory.slot; -import de.ellpeck.actuallyadditions.mod.items.ItemFilter; -import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.items.ItemFilter; +import de.ellpeck.actuallyadditions.tile.FilterSettings; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java index 7e915b4fe..19376f951 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotImmovable.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.inventory.slot; +package de.ellpeck.actuallyadditions.inventory.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotItemHandlerUnconditioned.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotItemHandlerUnconditioned.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java index 22a292f28..f92ada38a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotItemHandlerUnconditioned.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotItemHandlerUnconditioned.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.inventory.slot; +package de.ellpeck.actuallyadditions.inventory.slot; import javax.annotation.Nonnull; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java similarity index 72% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java rename to src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java index 69bba2ded..4939d8390 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/inventory/slot/SlotOutput.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.inventory.slot; +package de.ellpeck.actuallyadditions.inventory.slot; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; import net.minecraft.item.ItemStack; public class SlotOutput extends SlotItemHandlerUnconditioned { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java index 106dcba57..345bf1a80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/InitItems.java @@ -1,22 +1,22 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.items.base.ItemArmorAA; -import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodSeed; -import de.ellpeck.actuallyadditions.mod.items.base.ItemHoeAA; -import de.ellpeck.actuallyadditions.mod.items.base.ItemSeed; -import de.ellpeck.actuallyadditions.mod.items.base.ItemSwordAA; -import de.ellpeck.actuallyadditions.mod.items.lens.ItemLens; -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.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestMedium; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.items.base.ItemArmorAA; +import de.ellpeck.actuallyadditions.items.base.ItemFoodSeed; +import de.ellpeck.actuallyadditions.items.base.ItemHoeAA; +import de.ellpeck.actuallyadditions.items.base.ItemSeed; +import de.ellpeck.actuallyadditions.items.base.ItemSwordAA; +import de.ellpeck.actuallyadditions.items.lens.ItemLens; +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.tile.TileEntityGiantChest; +import de.ellpeck.actuallyadditions.tile.TileEntityGiantChestMedium; +import de.ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAllToolAA.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAllToolAA.java index 14ac36ec9..0dc5c8c38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAllToolAA.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.HashSet; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.items.base.ItemToolAA; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java index ff8e64897..397abb26e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemAxeAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.mod.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java index 89612448a..a686285cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBag.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerBag; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler.GuiTypes; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerBag; +import de.ellpeck.actuallyadditions.inventory.GuiHandler.GuiTypes; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java index 29235080e..b2820a6bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBattery.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -74,6 +74,4 @@ public class ItemBattery extends ItemEnergy { public void addInformation(ItemStack stack, World playerIn, List list, ITooltipFlag advanced) { super.addInformation(stack, playerIn, list, advanced); list.add(StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".battery." + (ItemUtil.isEnabled(stack) ? "discharge" : "noDischarge"))); - list.add(StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".battery.changeMode")); - } -} + list.add(StringUtil.localize("tooltip." + ActuallyAdditions.MO \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java index c3882826f..29e4c732c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemBooklet.java @@ -1,18 +1,18 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.IHudDisplay; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -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.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.IHudDisplay; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemChestToCrateUpgrade.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemChestToCrateUpgrade.java index f5edfe0f2..0ba7fe558 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemChestToCrateUpgrade.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityInventoryBase; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java index 861bb6177..190c7f5bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.ArrayList; import java.util.List; @@ -7,11 +7,11 @@ import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +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.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java similarity index 75% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java index e3e9e7a28..3be7032c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffeeBean.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java index 920569f70..b308aa44f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrafterOnAStick.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -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.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java index 8e5abaab4..2a57aee3f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystal.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.BlockCrystal; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.BlockCrystal; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java index 44012dcff..f1dfcc899 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCrystalShard.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.BlockCrystal; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.BlockCrystal; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java index cc8bcfef6..a2903a0c3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrill.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.HashSet; import java.util.List; @@ -6,17 +6,17 @@ import java.util.Set; import com.google.common.collect.Multimap; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerDrill; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; +import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.inventory.ContainerDrill; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.tile.TileEntityInventoryBase; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java index 54d6d3541..7a5015062 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDrillUpgrade.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.base.ItemBase; 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/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java index a709425a0..0f017ede3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemDust.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.metalists.TheDusts; +import de.ellpeck.actuallyadditions.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java index 40ba999dd..9fdbd3043 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemEngineerGoggles.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; import java.util.Set; import de.ellpeck.actuallyadditions.api.misc.IGoggles; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemArmorAA; -import de.ellpeck.actuallyadditions.mod.material.InitArmorMaterials; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.base.ItemArmorAA; +import de.ellpeck.actuallyadditions.material.InitArmorMaterials; +import de.ellpeck.actuallyadditions.util.StackUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java index 516b113ec..7a6c996dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFertilizer.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.misc.DispenserHandlerFertilize; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.misc.DispenserHandlerFertilize; import net.minecraft.block.BlockDispenser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFillingWand.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFillingWand.java index 6a415091e..969c91b6a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFillingWand.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java index a6ce8f6d1..b2ed87283 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFilter.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.inventory.ContainerFilter; +import de.ellpeck.actuallyadditions.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java index c6f4a3d3d..6a756b50f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemFoods.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java similarity index 74% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java index ade3259b5..1cfdb83c4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGeneric.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java index 289bccc8c..6f18e4720 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemGrowthRing.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; import net.minecraft.block.IGrowable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java index 4c7410032..fd704b923 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemHairyBall.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.Random; import java.util.UUID; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; @@ -69,6 +69,4 @@ public class ItemHairyBall extends ItemBase { @Override public EnumRarity getRarity(ItemStack stack) { - return EnumRarity.EPIC; - } -} + return \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemJams.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemJams.java index d03a629c9..e2aaba520 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemJams.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemFoodBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemFoodBase; +import de.ellpeck.actuallyadditions.common.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.common.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java index 6b557bb38..d5271f560 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemKnife.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import com.google.common.collect.Multimap; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserRelayUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java similarity index 74% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserRelayUpgrade.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java index d0eba78e7..02a6f8860 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserRelayUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserRelayUpgrade.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java index 913ba17ae..5802e7f4a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLaserWrench.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLeafBlower.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLeafBlower.java index c529601c0..b2b6abf03 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemLeafBlower.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.ArrayList; import java.util.Collections; import de.ellpeck.actuallyadditions.api.misc.IDisplayStandItem; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java index 6b71c8bbf..a2fd0f9b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMagnetRing.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.util.ItemUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java index e73dd03b2..1ae8bde09 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemMisc.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.fluids.InitFluids; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPhantomConnector.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPhantomConnector.java index 702cd92b1..8a52985e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPhantomConnector.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.common.items; import java.util.List; import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.base.ItemBase; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java index f414ed391..7d31c77a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPickaxeAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.mod.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java index a8353b15c..453fb2db7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPlayerProbe.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; import java.util.UUID; import javax.annotation.Nullable; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlayerInterface; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.tile.TileEntityPlayerInterface; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java index 29219b618..f8745b79f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemPotionRing.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.Collections; import java.util.List; @@ -6,13 +6,13 @@ import java.util.List; import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.misc.IDisplayStandItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.ThePotionRings; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.metalists.ThePotionRings; +import de.ellpeck.actuallyadditions.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; +import de.ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java index 062e93d1c..89590bab3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemResonantRice.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java index a3477b8ee..851a1fc2c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemShovelAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import de.ellpeck.actuallyadditions.mod.items.base.ItemToolAA; +import de.ellpeck.actuallyadditions.items.base.ItemToolAA; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java index d5842f009..d6f26b228 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSolidifiedExperience.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java index 304e4482f..d537f31ec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemSpawnerChanger.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java index 76b32460a..db397e3b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemTeleStaff.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.util.WorldUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java index c5819e5cb..8cc59d02a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterBowl.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java index c0441f2b3..f00f50879 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWaterRemovalRing.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.items.base.ItemEnergy; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java index 597da6df4..e56cdf910 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWingsOfTheBats.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.data.PlayerData; +import de.ellpeck.actuallyadditions.items.base.ItemBase; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.network.PacketHandlerHelper; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java index b61028026..6066b3151 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemWorm.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.items; +package de.ellpeck.actuallyadditions.items; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.entity.EntityWorm; -import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.entity.EntityWorm; +import de.ellpeck.actuallyadditions.items.base.ItemBase; import net.minecraft.block.BlockGrass; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemArmorAA.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemArmorAA.java index b12a57f19..e93039119 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemArmorAA.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.common.items.base; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnergizer; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.common.inventory.ContainerEnergizer; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java similarity index 80% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java index 7a52f9ffb..307ea49c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemBase.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.items.base; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.util.ItemUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java index 840e25766..79f2c0233 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemEnergy.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.items.base; import java.text.NumberFormat; import java.util.List; import javax.annotation.Nullable; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.CustomEnergyStorage; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.tile.CustomEnergyStorage; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java index 52345f131..1909b6d66 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodBase.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.items.base; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.util.ItemUtil; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java index 7b7118d19..64e36d1a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemFoodSeed.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.items.base; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.util.ItemUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemHoeAA.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemHoeAA.java index ebf2f903d..0ea3adbd0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemHoeAA.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.common.items.base; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSeed.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSeed.java index 57ff0aa32..b2efb2fd8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSeed.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.common.items.base; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java index 26e278265..2c991b119 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemSwordAA.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.items.base; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraftforge.common.IRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java index 58f62660a..17aa42bd3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/base/ItemToolAA.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.items.base; +package de.ellpeck.actuallyadditions.items.base; import java.util.Set; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.ConfigurationHandler; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/ItemLens.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/ItemLens.java index 03b9a2fe1..1f95e8008 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/ItemLens.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; 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.common.items.base.ItemBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java index 462b91d95..f40d577e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensColor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import java.util.List; import java.util.Map; @@ -8,7 +8,7 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.IColorLensChanger; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java index 400a4c3d2..7acd0e403 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDeath.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import java.util.ArrayList; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.mod.misc.DamageSources; +import de.ellpeck.actuallyadditions.misc.DamageSources; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java index b087883ea..6b98b9f6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDetonation.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java index f08d9445d..790e3a2fb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisenchanting.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import java.util.List; import java.util.Map; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.ItemUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java index 69efb2777..bb66be9e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensDisruption.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import java.util.ArrayList; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensKiller.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensKiller.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java index c6fdf8f4a..612766e86 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensKiller.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensKiller.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensMining.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensMining.java index d0be8a332..55da95ef2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensMining.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.common.items.lens; import java.util.List; @@ -6,12 +6,12 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.WeightedOre; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockNetherrack; import net.minecraft.block.BlockStone; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java index 4bc189a0b..9cf577ff0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/LensRecipeHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import java.util.ArrayList; import java.util.List; @@ -10,14 +10,14 @@ import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.ColorLensChangerByDyeMeta; import de.ellpeck.actuallyadditions.api.recipe.IColorLensChanger; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -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.recipe.ColorLensRotator; -import de.ellpeck.actuallyadditions.mod.recipe.EnchBookConversion; -import de.ellpeck.actuallyadditions.mod.util.RecipeUtil; +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.recipe.ColorLensRotator; +import de.ellpeck.actuallyadditions.recipe.EnchBookConversion; +import de.ellpeck.actuallyadditions.util.RecipeUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java index cd73b2616..28d87fd34 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/lens/Lenses.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.lens; +package de.ellpeck.actuallyadditions.items.lens; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.lens.LensConversion; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java index 71c43f75a..0e87f1e88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheCrystals.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items.metalists; +package de.ellpeck.actuallyadditions.items.metalists; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.util.Util; import net.minecraft.item.Rarity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java index c0fb1f344..f288baa15 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheDusts.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items.metalists; +package de.ellpeck.actuallyadditions.common.items.metalists; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import net.minecraft.item.EnumRarity; public enum TheDusts { @@ -21,7 +21,4 @@ public enum TheDusts { TheDusts(String name, int color, EnumRarity rarity) { this.name = name; this.color = color; - this.rarity = rarity; - } - -} \ No newline at end of file + this.rarity = rarit \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java index 24f110379..c304cea57 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheFoods.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.items.metalists; +package de.ellpeck.actuallyadditions.items.metalists; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java index 186de21d0..2b79665b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheJams.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.metalists; +package de.ellpeck.actuallyadditions.items.metalists; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java index ca078e4c0..29dbccb4b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/TheMiscItems.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.items.metalists; +package de.ellpeck.actuallyadditions.items.metalists; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.util.Util; import net.minecraft.item.EnumRarity; import net.minecraftforge.common.IRarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java rename to src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java index ef47e31b5..2d9021b14 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/metalists/ThePotionRings.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.items.metalists; +package de.ellpeck.actuallyadditions.items.metalists; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java similarity index 78% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java index 631f61e05..ebcd5e6b3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.jei; +package de.ellpeck.actuallyadditions.jei; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; @@ -7,25 +7,25 @@ import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiGrinder; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.jei.booklet.BookletRecipeCategory; -import de.ellpeck.actuallyadditions.mod.jei.booklet.BookletRecipeWrapper; -import de.ellpeck.actuallyadditions.mod.jei.coffee.CoffeeMachineRecipeCategory; -import de.ellpeck.actuallyadditions.mod.jei.coffee.CoffeeMachineRecipeWrapper; -import de.ellpeck.actuallyadditions.mod.jei.compost.CompostRecipeCategory; -import de.ellpeck.actuallyadditions.mod.jei.compost.CompostRecipeWrapper; -import de.ellpeck.actuallyadditions.mod.jei.crusher.CrusherRecipeCategory; -import de.ellpeck.actuallyadditions.mod.jei.crusher.CrusherRecipeWrapper; -import de.ellpeck.actuallyadditions.mod.jei.empowerer.EmpowererRecipeCategory; -import de.ellpeck.actuallyadditions.mod.jei.empowerer.EmpowererRecipeWrapper; -import de.ellpeck.actuallyadditions.mod.jei.reconstructor.ReconstructorRecipeCategory; -import de.ellpeck.actuallyadditions.mod.jei.reconstructor.ReconstructorRecipeWrapper; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.inventory.gui.GuiCoffeeMachine; +import de.ellpeck.actuallyadditions.inventory.gui.GuiFurnaceDouble; +import de.ellpeck.actuallyadditions.inventory.gui.GuiGrinder; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.jei.booklet.BookletRecipeCategory; +import de.ellpeck.actuallyadditions.jei.booklet.BookletRecipeWrapper; +import de.ellpeck.actuallyadditions.jei.coffee.CoffeeMachineRecipeCategory; +import de.ellpeck.actuallyadditions.jei.coffee.CoffeeMachineRecipeWrapper; +import de.ellpeck.actuallyadditions.jei.compost.CompostRecipeCategory; +import de.ellpeck.actuallyadditions.jei.compost.CompostRecipeWrapper; +import de.ellpeck.actuallyadditions.jei.crusher.CrusherRecipeCategory; +import de.ellpeck.actuallyadditions.jei.crusher.CrusherRecipeWrapper; +import de.ellpeck.actuallyadditions.jei.empowerer.EmpowererRecipeCategory; +import de.ellpeck.actuallyadditions.jei.empowerer.EmpowererRecipeWrapper; +import de.ellpeck.actuallyadditions.jei.reconstructor.ReconstructorRecipeCategory; +import de.ellpeck.actuallyadditions.jei.reconstructor.ReconstructorRecipeWrapper; +import de.ellpeck.actuallyadditions.util.Util; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java index 2bd45fa91..3b4c47eae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/RecipeWrapperWithButton.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.jei; +package de.ellpeck.actuallyadditions.common.jei; import java.util.Collections; import java.util.List; @@ -6,11 +6,11 @@ import java.util.List; import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.inventory.gui.TexturedButton; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.booklet.gui.GuiBooklet; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.inventory.gui.TexturedButton; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeCategory.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeCategory.java index 51d7f63fa..744d4b8eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeCategory.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.jei.booklet; +package de.ellpeck.actuallyadditions.common.jei.booklet; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java index 6bb29e004..691dcf0ff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/booklet/BookletRecipeWrapper.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.jei.booklet; +package de.ellpeck.actuallyadditions.jei.booklet; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java similarity index 85% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java index 0b969f1c7..7750f8a8f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeCategory.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.jei.coffee; +package de.ellpeck.actuallyadditions.jei.coffee; import java.util.Arrays; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java index a45b503ec..b3fabd3cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.jei.coffee; +package de.ellpeck.actuallyadditions.jei.coffee; import java.util.ArrayList; import java.util.List; @@ -8,14 +8,14 @@ import com.google.common.base.Strings; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/compost/CompostRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/compost/CompostRecipeCategory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java index bbb465ef0..cac42c196 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/compost/CompostRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeCategory.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.jei.compost; +package de.ellpeck.actuallyadditions.jei.compost; import java.util.Arrays; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/compost/CompostRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/compost/CompostRecipeWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java index 34f1a88a3..ced8ef301 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/compost/CompostRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.jei.compost; +package de.ellpeck.actuallyadditions.jei.compost; import java.util.Arrays; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.tile.TileEntityCompost; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeCategory.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeCategory.java index 61c55a452..f2023a3b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeCategory.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.jei.crusher; +package de.ellpeck.actuallyadditions.common.jei.crusher; import java.util.Arrays; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java index 730489550..ffcc6318b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.jei.crusher; +package de.ellpeck.actuallyadditions.jei.crusher; import java.util.ArrayList; import java.util.Arrays; @@ -6,11 +6,11 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java index 820584892..bbd8863de 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeCategory.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.jei.empowerer; +package de.ellpeck.actuallyadditions.jei.empowerer; import java.util.Arrays; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java index 11c38a227..5236e7000 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/empowerer/EmpowererRecipeWrapper.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.jei.empowerer; +package de.ellpeck.actuallyadditions.common.jei.empowerer; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.item.ItemStack; @@ -50,6 +50,4 @@ public class EmpowererRecipeWrapper extends RecipeWrapperWithButton { @Override public IBookletPage getPage() { - return BookletUtils.findFirstPageForStack(new ItemStack(InitBlocks.blockEmpowerer)); - } -} + return BookletUtils.findFirstPageForStack(new ItemStack(InitBlocks.b \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java index 780a9e865..2bbd6c522 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeCategory.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.jei.reconstructor; +package de.ellpeck.actuallyadditions.jei.reconstructor; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StringUtil; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java index 89570b08e..43f93be60 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/jei/reconstructor/ReconstructorRecipeWrapper.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.jei.reconstructor; +package de.ellpeck.actuallyadditions.common.jei.reconstructor; import java.util.Arrays; import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -import de.ellpeck.actuallyadditions.mod.recipe.EnchBookConversion; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.booklet.misc.BookletUtils; +import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton; +import de.ellpeck.actuallyadditions.common.recipe.EnchBookConversion; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.IRecipeWrapperFactory; @@ -79,8 +79,4 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton { @Override public void getIngredients(IIngredients ingredients) { ingredients.setInput(VanillaTypes.ITEM, BOOK); - ingredients.setOutput(VanillaTypes.ITEM, OUT); - } - - } -} + ingredients.setOutput(VanillaTypes.I \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/common/material/InitArmorMaterials.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java rename to src/main/java/de/ellpeck/actuallyadditions/common/material/InitArmorMaterials.java index 44ae16094..59982a78c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/material/InitArmorMaterials.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.material; +package de.ellpeck.actuallyadditions.common.material; import java.util.Locale; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java rename to src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java index 857239676..b4ca61934 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/material/InitToolMaterials.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.material; +package de.ellpeck.actuallyadditions.material; import java.util.Locale; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import net.minecraft.item.Item.ToolMaterial; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java index 1369f8500..fc3faa045 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/BannerHelper.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.misc; +package de.ellpeck.actuallyadditions.misc; import java.util.Locale; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.items.InitItems; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.BannerPattern; import net.minecraftforge.common.util.EnumHelper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java index 8433ae1f0..208da1276 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DamageSources.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.misc; +package de.ellpeck.actuallyadditions.misc; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java index 49ab708c4..96d00f250 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DispenserHandlerFertilize.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc; +package de.ellpeck.actuallyadditions.misc; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java index 538a6c5d2..9948a3b8b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/DungeonLoot.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.misc; +package de.ellpeck.actuallyadditions.misc; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; -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.TheJams; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; +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.TheJams; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/SoundHandler.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/SoundHandler.java index e8507c7c0..297c211f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/SoundHandler.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.misc; +package de.ellpeck.actuallyadditions.common.misc; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.RegistryHandler; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.RegistryHandler; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/ConnectionPair.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/ConnectionPair.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java index e12fc1afa..2669680b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/ConnectionPair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/ConnectionPair.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl; +package de.ellpeck.actuallyadditions.misc.apiimpl; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java index 7ef9498ec..b401bcfc5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/LaserRelayConnectionHandler.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl; +package de.ellpeck.actuallyadditions.misc.apiimpl; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.ILaserRelayConnectionHandler; import de.ellpeck.actuallyadditions.api.laser.LaserType; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.data.WorldData; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.data.WorldData; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; 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/mod/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java index f48c54cf7..850db31f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl; +package de.ellpeck.actuallyadditions.misc.apiimpl; import java.util.ArrayList; import java.util.List; @@ -12,18 +12,18 @@ import de.ellpeck.actuallyadditions.api.internal.IMethodHandler; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.BlockLaserRelay; -import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; -import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterTrials; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrafting; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageFurnace; -import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; -import de.ellpeck.actuallyadditions.mod.booklet.page.PageTextOnly; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; -import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.blocks.BlockLaserRelay; +import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter; +import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterTrials; +import de.ellpeck.actuallyadditions.booklet.page.PageCrafting; +import de.ellpeck.actuallyadditions.booklet.page.PageFurnace; +import de.ellpeck.actuallyadditions.booklet.page.PagePicture; +import de.ellpeck.actuallyadditions.booklet.page.PageTextOnly; +import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.items.lens.LensRecipeHandler; +import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java index 4b1c2c150..8b07dd9b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/CactusFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; @@ -77,5 +77,4 @@ public class CactusFarmerBehavior implements IFarmerBehavior { @Override public int getPriority() { return 4; - } -} + \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java index e6ca2d37d..dc85f5bdf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/DefaultFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java index e0863bce3..34e692d40 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java index 78c3d3f28..220880e08 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/NetherWartFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java index 3afc58c0e..cee1d1976 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/ReedFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer; +package de.ellpeck.actuallyadditions.misc.apiimpl.farmer; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java index 01d28faaf..82690b953 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/EnderlillyFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu; +package de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java index d472e578a..61a819a9b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu; +package de.ellpeck.actuallyadditions.common.misc.apiimpl.farmer.exu; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java similarity index 87% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java index 73d97ed51..f19a48483 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/farmer/exu/RedOrchidFarmerBehavior.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.exu; +package de.ellpeck.actuallyadditions.misc.apiimpl.farmer.exu; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneOre; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java index 21bd76399..47ff80f82 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/ISmileyCloudEasterEgg.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.misc.cloud; +package de.ellpeck.actuallyadditions.misc.cloud; public interface ISmileyCloudEasterEgg { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java index 1acf994aa..b6e6ec025 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/cloud/SmileyCloudEasterEggs.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.misc.cloud; +package de.ellpeck.actuallyadditions.misc.cloud; import java.util.ArrayList; import java.util.List; -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 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 net.minecraft.block.Block; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java index 396486c4e..9ebb27002 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/RenderSpecial.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.misc.special; +package de.ellpeck.actuallyadditions.misc.special; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java index da4c5e01b..48f44d110 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/SpecialRenderInit.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.misc.special; +package de.ellpeck.actuallyadditions.misc.special; import java.util.HashMap; import java.util.Locale; import java.util.Properties; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.util.StackUtil; 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/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java rename to src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java index e94fc6dfa..7046900c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.misc.special; +package de.ellpeck.actuallyadditions.misc.special; import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; public class ThreadSpecialFetcher extends Thread { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/IDataHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java similarity index 81% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/IDataHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java index 261a920b3..7ccd79231 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/IDataHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/IDataHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.network; +package de.ellpeck.actuallyadditions.network; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketClientToServer.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketClientToServer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java index 588707d0a..695e81d8e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketClientToServer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketClientToServer.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.network; +package de.ellpeck.actuallyadditions.network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java index c7ae14e61..61a9f3c40 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandler.java @@ -1,17 +1,17 @@ -package de.ellpeck.actuallyadditions.mod.network; +package de.ellpeck.actuallyadditions.common.network; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.data.WorldData; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor; -import de.ellpeck.actuallyadditions.mod.network.gui.IStringReactor; -import de.ellpeck.actuallyadditions.mod.particle.ParticleLaserItem; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.data.PlayerData; +import de.ellpeck.actuallyadditions.common.data.WorldData; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.network.gui.INumberReactor; +import de.ellpeck.actuallyadditions.common.network.gui.IStringReactor; +import de.ellpeck.actuallyadditions.common.particle.ParticleLaserItem; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; import net.minecraft.entity.Entity; @@ -171,7 +171,4 @@ public final class PacketHandler { DATA_HANDLERS.add(GUI_NUMBER_TO_TILE_HANDLER); DATA_HANDLERS.add(SYNC_PLAYER_DATA); DATA_HANDLERS.add(GUI_BUTTON_TO_CONTAINER_HANDLER); - DATA_HANDLERS.add(LASER_PARTICLE_HANDLER); - DATA_HANDLERS.add(PLAYER_DATA_TO_SERVER); - } -} + DATA_HANDLERS.add(LASER_PARTICLE_HA \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java index b47dde573..5020f7f02 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketHandlerHelper.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.network; +package de.ellpeck.actuallyadditions.network; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; -import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterTrials; -import de.ellpeck.actuallyadditions.mod.data.PlayerData; -import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave; +import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterTrials; +import de.ellpeck.actuallyadditions.data.PlayerData; +import de.ellpeck.actuallyadditions.data.PlayerData.PlayerSave; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java index 9b57b0f59..704454058 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/PacketServerToClient.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.network; +package de.ellpeck.actuallyadditions.network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ActuallyAdditions; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java index 1f3f7b12b..0d756862e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IButtonReactor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.network.gui; +package de.ellpeck.actuallyadditions.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java index 45393eec3..8b44e0ae5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/INumberReactor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.network.gui; +package de.ellpeck.actuallyadditions.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java index cdc80d45c..498fc875d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/network/gui/IStringReactor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.network.gui; +package de.ellpeck.actuallyadditions.network.gui; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java b/src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java rename to src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java index 9e60db46c..6bdf539c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/ore/InitOreDict.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.ore; +package de.ellpeck.actuallyadditions.ore; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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.TheDusts; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +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.TheDusts; +import de.ellpeck.actuallyadditions.items.metalists.TheFoods; +import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/particle/ParticleBeam.java b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/particle/ParticleBeam.java rename to src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java index afaed09c9..e6c5a9a84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/particle/ParticleBeam.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleBeam.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.particle; +package de.ellpeck.actuallyadditions.particle; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/particle/ParticleLaserItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/particle/ParticleLaserItem.java rename to src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java index d8a32627e..11b5e10b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/particle/ParticleLaserItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/particle/ParticleLaserItem.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.particle; +package de.ellpeck.actuallyadditions.particle; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java similarity index 74% rename from src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java rename to src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java index f714afd9f..96baf0104 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ClientProxy.java @@ -1,36 +1,36 @@ -package de.ellpeck.actuallyadditions.mod.proxy; +package de.ellpeck.actuallyadditions.proxy; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.ClientRegistryHandler; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderBatteryBox; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderDisplayStand; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderEmpowerer; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderLaserRelay; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderReconstructorLens; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderSmileyCloud; -import de.ellpeck.actuallyadditions.mod.entity.InitEntities; -import de.ellpeck.actuallyadditions.mod.entity.RenderWorm; -import de.ellpeck.actuallyadditions.mod.event.ClientEvents; -import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyAdvanced; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyExtreme; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayFluids; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItem; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist; -import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingBlock; -import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.ClientRegistryHandler; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.blocks.render.RenderBatteryBox; +import de.ellpeck.actuallyadditions.blocks.render.RenderDisplayStand; +import de.ellpeck.actuallyadditions.blocks.render.RenderEmpowerer; +import de.ellpeck.actuallyadditions.blocks.render.RenderLaserRelay; +import de.ellpeck.actuallyadditions.blocks.render.RenderReconstructorLens; +import de.ellpeck.actuallyadditions.blocks.render.RenderSmileyCloud; +import de.ellpeck.actuallyadditions.entity.InitEntities; +import de.ellpeck.actuallyadditions.entity.RenderWorm; +import de.ellpeck.actuallyadditions.event.ClientEvents; +import de.ellpeck.actuallyadditions.misc.special.SpecialRenderInit; +import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; +import de.ellpeck.actuallyadditions.tile.TileEntityBatteryBox; +import de.ellpeck.actuallyadditions.tile.TileEntityCompost; +import de.ellpeck.actuallyadditions.tile.TileEntityDisplayStand; +import de.ellpeck.actuallyadditions.tile.TileEntityEmpowerer; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergy; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergyAdvanced; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayEnergyExtreme; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayFluids; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayItem; +import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelayItemWhitelist; +import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; +import de.ellpeck.actuallyadditions.util.IColorProvidingBlock; +import de.ellpeck.actuallyadditions.util.IColorProvidingItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java rename to src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java index 86549d98b..db6eaace7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/IProxy.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.proxy; +package de.ellpeck.actuallyadditions.proxy; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java rename to src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java index b9711dade..6f8577ec9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/proxy/ServerProxy.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.proxy; +package de.ellpeck.actuallyadditions.common.proxy; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -44,6 +44,4 @@ public class ServerProxy implements IProxy { @Override public EntityPlayer getCurrentPlayer() { - return null; - } -} + return nul \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/ColorLensRotator.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/recipe/ColorLensRotator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java index 11392da16..6a000c596 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/ColorLensRotator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/ColorLensRotator.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.recipe; +package de.ellpeck.actuallyadditions.recipe; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java rename to src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java index c7c141c65..f28dd2900 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.recipe; +package de.ellpeck.actuallyadditions.recipe; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.util.StackUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java index 00fba6c4d..0d85ff127 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EmpowererHandler.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.recipe; +package de.ellpeck.actuallyadditions.recipe; import java.util.ArrayList; import java.util.List; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -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.RecipeUtil; +import de.ellpeck.actuallyadditions.blocks.InitBlocks; +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.RecipeUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EnchBookConversion.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EnchBookConversion.java rename to src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java index 7052a3fa5..d0812b046 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EnchBookConversion.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/EnchBookConversion.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.recipe; +package de.ellpeck.actuallyadditions.recipe; import java.util.Map; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java index 36ac53969..7e576db80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/HairyBallHandler.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.recipe; +package de.ellpeck.actuallyadditions.recipe; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.items.InitItems; +import de.ellpeck.actuallyadditions.items.InitItems; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java index e83984170..a1cb303a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/TreasureChestHandler.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.recipe; +package de.ellpeck.actuallyadditions.recipe; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; +import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheJams; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/CustomEnergyStorage.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/CustomEnergyStorage.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/CustomEnergyStorage.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/CustomEnergyStorage.java index 6d389d425..32ad5aea0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/CustomEnergyStorage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/CustomEnergyStorage.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.energy.EnergyStorage; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/FilterSettings.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/FilterSettings.java index a4f98bce3..867c67146 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/FilterSettings.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import org.apache.commons.lang3.ArrayUtils; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFilter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/IEnergyDisplay.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/IEnergyDisplay.java index 2f1f7592a..70479ec1d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/IEnergyDisplay.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/ISharingEnergyProvider.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/ISharingEnergyProvider.java index e582354a7..068f5cf24 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/ISharingEnergyProvider.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/ISharingFluidHandler.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/ISharingFluidHandler.java index 61534cbe0..6b1c415ec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/ISharingFluidHandler.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityAtomicReconstructor.java similarity index 90% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityAtomicReconstructor.java index 0840774c4..801e380b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityAtomicReconstructor.java @@ -1,16 +1,16 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.ILensItem; import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.misc.SoundHandler; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.misc.SoundHandler; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBase.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBase.java index 58b70a367..9e3a225ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBase.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.util.VanillaPacketDispatcher; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.util.VanillaPacketDispatcher; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBatteryBox.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBatteryBox.java index 96e3939b8..4f802ea38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBatteryBox.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.items.ItemBattery; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.ItemBattery; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBioReactor.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBioReactor.java index 34e9b18a2..61ed73fec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBioReactor.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.item.Item; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBreaker.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBreaker.java index 1c575815f..d832da50c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityBreaker.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCanolaPress.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCanolaPress.java index a1b57088f..4eaabb78a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCanolaPress.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoalGenerator.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoalGenerator.java index c6db37410..66b7a73de 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoalGenerator.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java index ba753d927..3c762d17f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.recipe.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.misc.SoundHandler; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemCoffee; +import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems; +import de.ellpeck.actuallyadditions.common.misc.SoundHandler; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.Util; 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/mod/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java index 603d98bbf..75ee79fc8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDirectionalBreaker.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDirectionalBreaker.java index 0c5ffe40b..1686833e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDirectionalBreaker.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDisplayStand.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDisplayStand.java index c88fb786a..baed2062d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDisplayStand.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.misc.IDisplayStandItem; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDropper.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDropper.java index efea32f0b..82e938259 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityDropper.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEmpowerer.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEmpowerer.java index 86a0fa2a6..fa6b34a82 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEmpowerer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import javax.annotation.Nullable; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEnergizer.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEnergizer.java index 3fb92e3e6..fb8d7e82c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEnergizer.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEnervator.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEnervator.java index 3ff5c0998..f9584ef3d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityEnervator.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFarmer.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFarmer.java index 576ae33d4..f6dbb4124 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFarmer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.Collections; @@ -8,11 +8,11 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.farmer.FarmerResult; import de.ellpeck.actuallyadditions.api.farmer.IFarmerBehavior; import de.ellpeck.actuallyadditions.api.internal.IFarmer; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntValues; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFeeder.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFeeder.java index 7631d84c6..0bc6211af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFeeder.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.List; import java.util.Optional; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFermentingBarrel.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFermentingBarrel.java index b121c71f1..ce3e14491 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFermentingBarrel.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.fluids.InitFluids; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFireworkBox.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFireworkBox.java index 2896b22d6..8caa9a6d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFireworkBox.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor; +import de.ellpeck.actuallyadditions.common.network.gui.INumberReactor; import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFishingNet.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFishingNet.java index 34cac9820..b81990c73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFishingNet.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.List; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFluidCollector.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFluidCollector.java index 9ebec3b9f..4aaa1da0c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFluidCollector.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.Util; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.Util; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFluidPlacer.java similarity index 78% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFluidPlacer.java index f1fb54612..f4eb4444b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFluidPlacer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityFluidPlacer extends TileEntityFluidCollector { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFurnaceDouble.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFurnaceDouble.java index 2639858b3..cf2b7a645 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFurnaceDouble.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.blocks.BlockFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.blocks.BlockFurnaceDouble; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.ItemUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFurnaceSolar.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFurnaceSolar.java index 03488c90e..9bcae5f83 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityFurnaceSolar.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChest.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChest.java index 9c7f20810..bf8811aa7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChest.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.AwfulUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.AwfulUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChestLarge.java similarity index 76% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChestLarge.java index 5910011e4..cf30369ff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChestLarge.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityGiantChestLarge extends TileEntityGiantChest { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChestMedium.java similarity index 77% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChestMedium.java index 22c11d253..3617b9082 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGiantChestMedium.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityGiantChestMedium extends TileEntityGiantChest { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java index 6a16fed67..e6500301f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.BlockFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.misc.SoundHandler; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.blocks.BlockFurnaceDouble; +import de.ellpeck.actuallyadditions.common.misc.SoundHandler; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.recipe.CrusherRecipeRegistry; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinderDouble.java similarity index 78% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinderDouble.java index 2589fd029..7385663f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinderDouble.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityGrinderDouble extends TileEntityGrinder { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityHeatCollector.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityHeatCollector.java index 019f4d83f..840f0ee47 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityHeatCollector.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockMagma; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInputter.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInputter.java index 8441071aa..c4ec5cb38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInputter.java @@ -1,18 +1,18 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.cyclops.commoncapabilities.capability.itemhandler.SlotlessItemHandlerConfig; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.network.gui.INumberReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInputterAdvanced.java similarity index 79% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInputterAdvanced.java index c0079ad27..9065975fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInputterAdvanced.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityInputterAdvanced extends TileEntityInputter { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInventoryBase.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInventoryBase.java index 55d4a9af6..7a5f7ffc9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityInventoryBase.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemRepairer.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemRepairer.java index 438dedcb5..401f61542 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemRepairer.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemViewer.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemViewer.java index 5078bf01a..0b62e4af0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemViewer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.Collections; @@ -10,13 +10,13 @@ import org.cyclops.commoncapabilities.api.capability.itemhandler.ISlotlessItemHa import org.cyclops.commoncapabilities.capability.itemhandler.SlotlessItemHandlerConfig; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import de.ellpeck.actuallyadditions.mod.util.compat.CommonCapsUtil; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.network.PacketHandler; +import de.ellpeck.actuallyadditions.common.network.PacketServerToClient; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.compat.CommonCapsUtil; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemViewerHopping.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemViewerHopping.java index 382b2ad58..9d6ea8717 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityItemViewerHopping.java @@ -1,14 +1,14 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.List; import org.cyclops.commoncapabilities.api.capability.itemhandler.ISlotlessItemHandler; import org.cyclops.commoncapabilities.capability.itemhandler.SlotlessItemHandlerConfig; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; import net.minecraft.block.BlockHopper; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelay.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelay.java index 42b293045..1f8db2971 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelay.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.misc.apiimpl.ConnectionPair; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.misc.apiimpl.ConnectionPair; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import io.netty.util.internal.ConcurrentSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergy.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergy.java index d5d0a0db0..6ac6dc3c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergy.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.HashMap; import java.util.Map; @@ -8,9 +8,9 @@ import java.util.concurrent.ConcurrentHashMap; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.util.StringUtil; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergyAdvanced.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergyAdvanced.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergyAdvanced.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergyAdvanced.java index dc10efb3f..73b9bf62f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergyAdvanced.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergyAdvanced.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityLaserRelayEnergyAdvanced extends TileEntityLaserRelayEnergy { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergyExtreme.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergyExtreme.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergyExtreme.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergyExtreme.java index e50c46db1..b8d884369 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergyExtreme.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayEnergyExtreme.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityLaserRelayEnergyExtreme extends TileEntityLaserRelayEnergy { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayFluids.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayFluids.java index b6e4a1654..0f33496aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayFluids.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.HashMap; import java.util.HashSet; @@ -9,10 +9,10 @@ import java.util.concurrent.ConcurrentHashMap; import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy.Mode; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.TileEntityLaserRelayEnergy.Mode; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayItem.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayItem.java index 4c9992256..647a2d944 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayItem.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.HashMap; import java.util.HashSet; @@ -12,11 +12,11 @@ import org.cyclops.commoncapabilities.capability.itemhandler.SlotlessItemHandler import de.ellpeck.actuallyadditions.api.laser.IConnectionPair; import de.ellpeck.actuallyadditions.api.laser.LaserType; import de.ellpeck.actuallyadditions.api.laser.Network; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewer.GenericItemHandlerInfo; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemViewer.GenericItemHandlerInfo; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; 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/mod/tile/TileEntityLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayItemWhitelist.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayItemWhitelist.java index 8d35166ea..53d591a4a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLaserRelayItemWhitelist.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.inventory.ContainerFilter; +import de.ellpeck.actuallyadditions.common.inventory.slot.SlotFilter; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; 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/mod/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLavaFactoryController.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLavaFactoryController.java index 9b088f551..cafe8d80b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLavaFactoryController.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; +import de.ellpeck.actuallyadditions.common.blocks.metalists.TheMiscBlocks; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLeafGenerator.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLeafGenerator.java index 229b66c90..7503138ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityLeafGenerator.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityMiner.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityMiner.java index 7d72cf307..aa7a84d2b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityMiner.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; -import de.ellpeck.actuallyadditions.mod.items.ItemDrill; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues; +import de.ellpeck.actuallyadditions.common.items.ItemDrill; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.AssetUtil; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityOilGenerator.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityOilGenerator.java index 90aa7f60b..c472efc6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityOilGenerator.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.OilGenRecipe; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.config.values.ConfigIntListValues; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomBooster.java similarity index 74% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomBooster.java index 846419f06..1d155a97b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomBooster.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; public class TileEntityPhantomBooster extends TileEntityBase { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomBreaker.java similarity index 59% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomBreaker.java index 693ce521c..f33954bb7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomBreaker.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; public class TileEntityPhantomBreaker extends TileEntityPhantomPlacer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomEnergyface.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomEnergyface.java index b4b7a01b2..beeb62a9d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomEnergyface.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.common.blocks.BlockPhantom; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomItemface.java similarity index 82% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomItemface.java index 22a629429..d19e50002 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomItemface.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomLiquiface.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomLiquiface.java index 20bc5d219..aa30dd609 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomLiquiface.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.common.blocks.BlockPhantom; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomPlacer.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomPlacer.java index 03a6cf6fc..7b559821b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomPlacer.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import de.ellpeck.actuallyadditions.common.inventory.GuiHandler; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover; +import de.ellpeck.actuallyadditions.common.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomRedstoneface.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomRedstoneface.java index e998de7ea..9dc9dadc4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomRedstoneface.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.Arrays; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomface.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomface.java index e8502faae..0775c752c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPhantomface.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; 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.common.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.common.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPlacer.java similarity index 57% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPlacer.java index 7ef7e6331..f53fabc53 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPlacer.java @@ -1,7 +1,7 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; public class TileEntityPlacer extends TileEntityBreaker { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPlayerInterface.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPlayerInterface.java index 23db75403..0cb591dc4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityPlayerInterface.java @@ -1,8 +1,8 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.UUID; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.util.StackUtil; 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/mod/tile/TileEntityRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityRangedCollector.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityRangedCollector.java index 4828fb296..d776a1eff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityRangedCollector.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; 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/mod/tile/TileEntityShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityShockSuppressor.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityShockSuppressor.java index 6fb944ccf..34b258122 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityShockSuppressor.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntitySmileyCloud.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntitySmileyCloud.java index 9eaa636db..17000d78c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntitySmileyCloud.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; -import de.ellpeck.actuallyadditions.mod.network.gui.IStringReactor; +import de.ellpeck.actuallyadditions.common.network.gui.IStringReactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityXPSolidifier.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java rename to src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityXPSolidifier.java index 56c98c9a4..a9ea6b000 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityXPSolidifier.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.tile; +package de.ellpeck.actuallyadditions.common.tile; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.ItemSolidifiedExperience; -import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; -import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.InitItems; +import de.ellpeck.actuallyadditions.common.items.ItemSolidifiedExperience; +import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor; +import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/common/update/ThreadUpdateChecker.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/update/ThreadUpdateChecker.java index 5377ac05f..d9a706a28 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/update/ThreadUpdateChecker.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.update; +package de.ellpeck.actuallyadditions.common.update; import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.util.Util; public class ThreadUpdateChecker extends Thread { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/common/update/UpdateChecker.java similarity index 88% rename from src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java rename to src/main/java/de/ellpeck/actuallyadditions/common/update/UpdateChecker.java index ff08d16ea..641c0bfc6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/update/UpdateChecker.java @@ -1,9 +1,9 @@ -package de.ellpeck.actuallyadditions.mod.update; +package de.ellpeck.actuallyadditions.common.update; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.common.util.StringUtil; +import de.ellpeck.actuallyadditions.common.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/AssetUtil.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/AssetUtil.java index cab147f31..11a9b8b9b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/AssetUtil.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import org.lwjgl.opengl.GL11; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient; -import de.ellpeck.actuallyadditions.mod.particle.ParticleBeam; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.network.PacketHandler; +import de.ellpeck.actuallyadditions.common.network.PacketServerToClient; +import de.ellpeck.actuallyadditions.common.particle.ParticleBeam; +import de.ellpeck.actuallyadditions.common.tile.TileEntityBase; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/AwfulUtil.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/AwfulUtil.java index 0745cb67f..995d86068 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AwfulUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/AwfulUtil.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/FluidStateMapper.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/FluidStateMapper.java index 906fcf4e8..bf48f6603 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/FluidStateMapper.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/IColorProvidingBlock.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/IColorProvidingBlock.java index 7c99ee573..21b8d3aa9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/IColorProvidingBlock.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/IColorProvidingItem.java similarity index 83% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/IColorProvidingItem.java index 388e8f1a1..793f78b03 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/IColorProvidingItem.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import net.minecraft.client.renderer.color.IItemColor; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemStackHandlerAA.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemStackHandlerAA.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemStackHandlerAA.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/ItemStackHandlerAA.java index dbedef82a..0a7b94952 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemStackHandlerAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemStackHandlerAA.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java index cba748abd..5b88a7520 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/ItemUtil.java @@ -1,13 +1,13 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.util.Arrays; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.RegistryHandler; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockItemBase; -import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; -import de.ellpeck.actuallyadditions.mod.util.compat.IMCHandler; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.RegistryHandler; +import de.ellpeck.actuallyadditions.common.blocks.base.BlockItemBase; +import de.ellpeck.actuallyadditions.common.creative.CreativeTab; +import de.ellpeck.actuallyadditions.common.util.compat.IMCHandler; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java index 651d67554..64fcd8ddd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.util.Set; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java similarity index 89% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java index 7280b2340..00bf93659 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.util.List; @@ -6,7 +6,7 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import de.ellpeck.actuallyadditions.mod.util.crafting.RecipeHandler; +import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler; import net.minecraft.item.crafting.IRecipe; public final class RecipeUtil { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RefHelp.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/RefHelp.java similarity index 99% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/RefHelp.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/RefHelp.java index f25841218..bc9ff3100 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RefHelp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/RefHelp.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/StackUtil.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/StackUtil.java index c40594d72..a32a9f289 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/StackUtil.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.util.Collection; import java.util.List; @@ -6,8 +6,8 @@ import java.util.List; import org.cyclops.commoncapabilities.api.capability.itemhandler.ISlotlessItemHandler; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/StringUtil.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/StringUtil.java index a88d6eff5..4ac698807 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/StringUtil.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.io.InputStream; import java.lang.reflect.Method; import java.util.List; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/Util.java similarity index 94% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/Util.java index b5497ee2b..3d78d94e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/Util.java @@ -1,6 +1,6 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.item.Rarity; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/VanillaPacketDispatcher.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/VanillaPacketDispatcher.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/VanillaPacketDispatcher.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/VanillaPacketDispatcher.java index 2bc923da9..3d2f21189 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/VanillaPacketDispatcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/VanillaPacketDispatcher.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.management.PlayerChunkMapEntry; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/WorldUtil.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/WorldUtil.java index b434d0915..0c0fa34e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/WorldUtil.java @@ -1,12 +1,12 @@ -package de.ellpeck.actuallyadditions.mod.util; +package de.ellpeck.actuallyadditions.common.util; import java.util.ArrayList; import org.cyclops.commoncapabilities.api.capability.itemhandler.ISlotlessItemHandler; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; -import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.tile.FilterSettings; +import de.ellpeck.actuallyadditions.common.util.compat.SlotlessableItemHandlerWrapper; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CommonCapsUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CommonCapsUtil.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CommonCapsUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CommonCapsUtil.java index 547e6ce84..495b90404 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CommonCapsUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CommonCapsUtil.java @@ -1,11 +1,11 @@ -package de.ellpeck.actuallyadditions.mod.util.compat; +package de.ellpeck.actuallyadditions.common.util.compat; import org.cyclops.commoncapabilities.api.capability.itemhandler.DefaultSlotlessItemHandlerWrapper; import org.cyclops.commoncapabilities.api.capability.itemhandler.ISlotlessItemHandler; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewer.SlotlessItemHandlerInfo; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemViewer; +import de.ellpeck.actuallyadditions.common.tile.TileEntityItemViewer.SlotlessItemHandlerInfo; +import de.ellpeck.actuallyadditions.common.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java similarity index 93% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java index f1f0db33f..b1854d0ff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatFastBench.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util.compat; +package de.ellpeck.actuallyadditions.common.util.compat; import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +24,4 @@ public class CompatFastBench { @SideOnly(Side.CLIENT) public static Gui getFastBenchGui(EntityPlayer p, World world) { return new GuiFastBench(p.inventory, world, BlockPos.ORIGIN); - } - -} + } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatUtil.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatUtil.java index e137c930f..8e9b257dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/CompatUtil.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util.compat; +package de.ellpeck.actuallyadditions.common.util.compat; import net.minecraft.client.gui.inventory.GuiCrafting; import net.minecraft.entity.player.EntityPlayer; @@ -33,8 +33,8 @@ public final class CompatUtil { public static void registerCraftingTweaks() { NBTTagCompound t = new NBTTagCompound(); - if (fb) t.setString("ContainerClass", "de.ellpeck.actuallyadditions.mod.util.compat.CompatFastBench$1"); - else t.setString("ContainerClass", "de.ellpeck.actuallyadditions.mod.util.compat.CompatUtil$1"); + if (fb) t.setString("ContainerClass", "de.ellpeck.actuallyadditions.common.util.compat.CompatFastBench$1"); + else t.setString("ContainerClass", "de.ellpeck.actuallyadditions.common.util.compat.CompatUtil$1"); FMLInterModComms.sendMessage("craftingtweaks", "RegisterProvider", t); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java similarity index 57% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java index a3b132ed3..f48be0f88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/IMCHandler.java @@ -1,15 +1,15 @@ -package de.ellpeck.actuallyadditions.mod.util.compat; +package de.ellpeck.actuallyadditions.util.compat; import org.apache.commons.lang3.ArrayUtils; -import de.ellpeck.actuallyadditions.mod.blocks.BlockGiantChest; -import de.ellpeck.actuallyadditions.mod.blocks.BlockItemViewer; -import de.ellpeck.actuallyadditions.mod.blocks.BlockItemViewerHopping; -import de.ellpeck.actuallyadditions.mod.blocks.BlockLaserRelay; -import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; -import de.ellpeck.actuallyadditions.mod.blocks.BlockTinyTorch; -import de.ellpeck.actuallyadditions.mod.blocks.BlockWildPlant; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; +import de.ellpeck.actuallyadditions.blocks.BlockGiantChest; +import de.ellpeck.actuallyadditions.blocks.BlockItemViewer; +import de.ellpeck.actuallyadditions.blocks.BlockItemViewerHopping; +import de.ellpeck.actuallyadditions.blocks.BlockLaserRelay; +import de.ellpeck.actuallyadditions.blocks.BlockPhantom; +import de.ellpeck.actuallyadditions.blocks.BlockTinyTorch; +import de.ellpeck.actuallyadditions.blocks.BlockWildPlant; +import de.ellpeck.actuallyadditions.blocks.base.BlockPlant; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fml.common.event.FMLInterModComms; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java similarity index 91% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java index ac8e9ecfc..5fba9f8a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/SlotlessableItemHandlerWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/compat/SlotlessableItemHandlerWrapper.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util.compat; +package de.ellpeck.actuallyadditions.util.compat; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/BlankRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java similarity index 92% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/BlankRecipe.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java index e8f3ea081..dd517486d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/BlankRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/BlankRecipe.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util.crafting; +package de.ellpeck.actuallyadditions.util.crafting; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/IRecipeGrouped.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java similarity index 53% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/IRecipeGrouped.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java index 32b2be5b9..692596929 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/IRecipeGrouped.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/IRecipeGrouped.java @@ -1,4 +1,4 @@ -package de.ellpeck.actuallyadditions.mod.util.crafting; +package de.ellpeck.actuallyadditions.util.crafting; public interface IRecipeGrouped { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java similarity index 95% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java index a853282d7..b4b9a7716 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHandler.java @@ -8,7 +8,7 @@ Original: https://github.com/Glitchfiend/BiomesOPlenty/blob/0f8be0526e01d918cf8f22d4904a3b74981dee6f/src/main/java/biomesoplenty/common/util/inventory/CraftingUtil.java (edited to work with multiple mods) */ -package de.ellpeck.actuallyadditions.mod.util.crafting; +package de.ellpeck.actuallyadditions.util.crafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java similarity index 98% rename from src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java rename to src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java index 3f3fab225..ca3778122 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/crafting/RecipeHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/crafting/RecipeHelper.java @@ -1,10 +1,10 @@ -package de.ellpeck.actuallyadditions.mod.util.crafting; +package de.ellpeck.actuallyadditions.util.crafting; import java.util.List; import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.RegistryHandler; +import de.ellpeck.actuallyadditions.ActuallyAdditions; +import de.ellpeck.actuallyadditions.RegistryHandler; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/AADataGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/AADataGenerator.java new file mode 100644 index 000000000..7386378de --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/AADataGenerator.java @@ -0,0 +1,4 @@ +package de.ellpeck.actuallyadditions.data; + +public class AADataGenerator { +}