From ff076090e30133cf63c8c965d32699aedbae9022 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 4 Mar 2016 00:44:50 -0800 Subject: [PATCH] Move plugins to their respective folders --- .../forestry/apiculture/BeekeepingLogic.java | 1 - .../forestry/apiculture/HasFlowersCache.java | 1 - .../PluginApiculture.java | 12 +- .../apiculture/blocks/BlockBeehives.java | 2 +- .../apiculture/blocks/BlockStump.java | 2 +- .../entities/EntityMinecartApiary.java | 2 +- .../entities/EntityMinecartBeehouse.java | 2 +- .../apiculture/genetics/BeeDefinition.java | 4 +- .../forestry/apiculture/genetics/BeeRoot.java | 2 +- .../forestry/apiculture/gui/GuiBeealyzer.java | 2 +- .../forestry/apiculture/gui/GuiImprinter.java | 2 +- .../inventory/InventoryAlvearySieve.java | 2 +- .../ItemInventoryHabitatLocator.java | 2 +- .../apiculture/items/ItemArmorApiarist.java | 2 +- .../apiculture/items/ItemHabitatLocator.java | 1 + .../worldgen/ComponentVillageBeeHouse.java | 4 +- .../apiculture/worldgen/HiveDecorator.java | 2 +- .../apiculture/worldgen/HiveDescription.java | 2 +- .../worldgen/HiveDescriptionSwarmer.java | 2 +- .../PluginArboriculture.java | 8 +- .../arboriculture/blocks/BlockArbFence.java | 2 +- .../arboriculture/blocks/BlockSlab.java | 2 +- .../genetics/TreeDefinition.java | 2 +- .../arboriculture/genetics/TreeRoot.java | 2 +- .../arboriculture/gui/GuiTreealyzer.java | 2 +- .../arboriculture/items/ItemBlockLeaves.java | 2 +- .../proxy/ProxyArboricultureClient.java | 2 +- .../render/ModelProviderGermling.java | 2 +- .../arboriculture/tiles/TileWood.java | 2 +- .../forestry/core/CreativeTabForestry.java | 1 - .../{plugins => core}/PluginCore.java | 9 +- .../{plugins => core}/PluginFluids.java | 365 +++++++++--------- .../core/blocks/BlockResourceOre.java | 2 +- .../java/forestry/core/blocks/BlockSoil.java | 2 +- .../core/circuits/CircuitRegistry.java | 2 +- .../core/circuits/ItemCircuitBoard.java | 2 +- .../java/forestry/core/config/GameMode.java | 4 +- .../forestry/core/fluids/FluidHelper.java | 2 +- .../core/fluids/LiquidRegistryHelper.java | 2 +- .../core/genetics/alleles/AlleleRegistry.java | 2 +- .../core/genetics/alleles/AlleleSpecies.java | 2 +- .../core/inventory/ItemInventoryAlyzer.java | 2 +- .../java/forestry/core/items/ItemFruit.java | 2 +- .../java/forestry/core/models/ModelCrate.java | 2 +- .../java/forestry/core/utils/EntityUtil.java | 4 - .../core/worldgen/WorldGenerator.java | 2 +- .../{plugins => energy}/PluginEnergy.java | 5 +- .../energy/blocks/BlockTypeEngine.java | 2 +- .../forestry/energy/tiles/TileEnginePeat.java | 2 +- .../{plugins => factory}/PluginFactory.java | 10 +- .../{plugins => farming}/PluginFarming.java | 6 +- .../java/forestry/farming/logic/CropPeat.java | 2 +- .../farming/logic/FarmLogicArboreal.java | 2 +- .../farming/logic/FarmLogicOrchard.java | 2 +- .../forestry/farming/logic/FarmLogicPeat.java | 2 +- .../forestry/farming/logic/FarmableGE.java | 2 +- .../logic/FarmableVanillaMushroom.java | 2 +- .../farming/multiblock/InventoryFarm.java | 2 +- .../farming/proxy/ProxyFarmingClient.java | 2 +- .../{plugins => food}/PluginFood.java | 9 +- .../food/inventory/ItemInventoryInfuser.java | 2 +- .../lepidopterology/ButterflySpawner.java | 1 - .../PluginLepidopterology.java | 7 +- .../entities/AIButterflyMate.java | 2 +- .../entities/AIButterflyPollinate.java | 2 +- .../genetics/ButterflyRoot.java | 2 +- .../lepidopterology/gui/GuiFlutterlyzer.java | 2 +- .../items/ItemButterflyGE.java | 2 +- .../java/forestry/mail/LetterProperties.java | 1 - .../{plugins => mail}/PluginMail.java | 11 +- src/main/java/forestry/mail/PostOffice.java | 1 - src/main/java/forestry/mail/PostRegistry.java | 1 - src/main/java/forestry/mail/TradeStation.java | 1 - .../java/forestry/plugins/PluginManager.java | 1 + .../plugins/compat/PluginBiomesOPlenty.java | 2 +- .../compat/PluginBuildCraftTransport.java | 2 +- .../forestry/plugins/compat/PluginNatura.java | 2 +- .../java/forestry/storage/CrateRegistry.java | 1 - .../{plugins => storage}/PluginStorage.java | 13 +- 79 files changed, 302 insertions(+), 286 deletions(-) rename src/main/java/forestry/{plugins => apiculture}/PluginApiculture.java (99%) rename src/main/java/forestry/{plugins => arboriculture}/PluginArboriculture.java (99%) rename src/main/java/forestry/{plugins => core}/PluginCore.java (98%) rename src/main/java/forestry/{plugins => core}/PluginFluids.java (97%) rename src/main/java/forestry/{plugins => energy}/PluginEnergy.java (94%) mode change 100755 => 100644 rename src/main/java/forestry/{plugins => factory}/PluginFactory.java (98%) rename src/main/java/forestry/{plugins => farming}/PluginFarming.java (98%) rename src/main/java/forestry/{plugins => food}/PluginFood.java (93%) mode change 100755 => 100644 rename src/main/java/forestry/{plugins => lepidopterology}/PluginLepidopterology.java (96%) mode change 100755 => 100644 rename src/main/java/forestry/{plugins => mail}/PluginMail.java (95%) mode change 100755 => 100644 rename src/main/java/forestry/{plugins => storage}/PluginStorage.java (98%) mode change 100755 => 100644 diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index f49179da5..5e9825a98 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -47,7 +47,6 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; -import forestry.plugins.PluginApiculture; public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { diff --git a/src/main/java/forestry/apiculture/HasFlowersCache.java b/src/main/java/forestry/apiculture/HasFlowersCache.java index 2e67b722a..04b8bfab1 100644 --- a/src/main/java/forestry/apiculture/HasFlowersCache.java +++ b/src/main/java/forestry/apiculture/HasFlowersCache.java @@ -25,7 +25,6 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import forestry.api.genetics.IFlowerProvider; import forestry.core.utils.vect.Vect; -import forestry.plugins.PluginApiculture; public class HasFlowersCache implements INbtWritable, INbtReadable { private static final String nbtKey = "hasFlowerCache"; diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java similarity index 99% rename from src/main/java/forestry/plugins/PluginApiculture.java rename to src/main/java/forestry/apiculture/PluginApiculture.java index 6bcfac848..62f872ed7 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.apiculture; import com.google.common.collect.ImmutableMap; @@ -60,8 +60,6 @@ import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.apiculture.ArmorApiaristHelper; -import forestry.apiculture.SaveEventHandlerApiculture; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.blocks.BlockCandle; import forestry.apiculture.blocks.BlockRegistryApiculture; @@ -75,8 +73,8 @@ import forestry.apiculture.flowers.FlowerRegistry; import forestry.apiculture.genetics.BeeBranchDefinition; import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.genetics.BeeFactory; -import forestry.apiculture.genetics.BeeRoot; import forestry.apiculture.genetics.BeeMutationFactory; +import forestry.apiculture.genetics.BeeRoot; import forestry.apiculture.genetics.BeekeepingMode; import forestry.apiculture.genetics.HiveDrop; import forestry.apiculture.genetics.JubilanceFactory; @@ -102,6 +100,8 @@ import forestry.apiculture.worldgen.HiveDescription; import forestry.apiculture.worldgen.HiveGenHelper; import forestry.apiculture.worldgen.HiveRegistry; import forestry.core.ISaveEventHandler; +import forestry.core.PluginCore; +import forestry.core.PluginFluids; import forestry.core.blocks.BlockTypeCoreTesr; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -117,7 +117,11 @@ import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Stack; import forestry.core.utils.StringUtil; +import forestry.food.PluginFood; import forestry.food.items.ItemRegistryFood; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description") public class PluginApiculture extends BlankForestryPlugin { diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java index 872a006dd..3439b02bb 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java @@ -34,11 +34,11 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.tiles.TileSwarm; import forestry.core.config.Config; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginApiculture; public class BlockBeehives extends BlockContainer implements IItemModelRegister { private static final PropertyEnum HIVE_TYPES = PropertyEnum.create("hive", HiveType.class); diff --git a/src/main/java/forestry/apiculture/blocks/BlockStump.java b/src/main/java/forestry/apiculture/blocks/BlockStump.java index 96884fdd9..e713fcd81 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockStump.java +++ b/src/main/java/forestry/apiculture/blocks/BlockStump.java @@ -31,11 +31,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.tiles.TileCandle; import forestry.core.config.Constants; import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginApiculture; public class BlockStump extends BlockTorch implements IItemModelRegister { diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index 8530429ce..5f0dd020b 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -27,6 +27,7 @@ import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.ApiaryBeeListener; import forestry.apiculture.ApiaryBeeModifier; import forestry.apiculture.IApiary; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.blocks.BlockTypeApiculture; import forestry.apiculture.gui.ContainerMinecartBeehouse; import forestry.apiculture.gui.GuiBeeHousing; @@ -34,7 +35,6 @@ import forestry.apiculture.inventory.IApiaryInventory; import forestry.apiculture.inventory.InventoryApiary; import forestry.core.config.Config; import forestry.core.inventory.IInventoryAdapter; -import forestry.plugins.PluginApiculture; public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implements IApiary { private static final IBeeModifier beeModifier = new ApiaryBeeModifier(); diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index f31f8452f..56f28a289 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -24,12 +24,12 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.apiculture.BeehouseBeeModifier; import forestry.apiculture.InventoryBeeHousing; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.blocks.BlockTypeApiculture; import forestry.apiculture.gui.ContainerMinecartBeehouse; import forestry.apiculture.gui.GuiBeeHousing; import forestry.core.config.Config; import forestry.core.inventory.IInventoryAdapter; -import forestry.plugins.PluginApiculture; public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { private static final IBeeModifier beeModifier = new BeehouseBeeModifier(); diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 8af179bb8..8351719f6 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -33,13 +33,13 @@ import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.apiculture.items.EnumHoneyComb; import forestry.apiculture.items.EnumPollenCluster; +import forestry.core.PluginCore; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; -import forestry.plugins.PluginApiculture; -import forestry.plugins.PluginCore; public enum BeeDefinition implements IBeeDefinition { /* HONEY BRANCH */ diff --git a/src/main/java/forestry/apiculture/genetics/BeeRoot.java b/src/main/java/forestry/apiculture/genetics/BeeRoot.java index a2f377ea6..ca75a135d 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeRoot.java +++ b/src/main/java/forestry/apiculture/genetics/BeeRoot.java @@ -49,8 +49,8 @@ import forestry.api.genetics.IMutation; import forestry.apiculture.BeeHousingListener; import forestry.apiculture.BeeHousingModifier; import forestry.apiculture.BeekeepingLogic; +import forestry.apiculture.PluginApiculture; import forestry.core.genetics.SpeciesRoot; -import forestry.plugins.PluginApiculture; public class BeeRoot extends SpeciesRoot implements IBeeRoot { diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 51c495d74..3de803d0d 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -23,6 +23,7 @@ import forestry.api.apiculture.IBee; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.inventory.ItemInventoryBeealyzer; import forestry.core.genetics.alleles.AlleleBoolean; @@ -31,7 +32,6 @@ import forestry.core.gui.GuiAlyzer; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; -import forestry.plugins.PluginApiculture; public class GuiBeealyzer extends GuiAlyzer { diff --git a/src/main/java/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java index c44bc4d64..6dfe5f2c8 100755 --- a/src/main/java/forestry/apiculture/gui/GuiImprinter.java +++ b/src/main/java/forestry/apiculture/gui/GuiImprinter.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.inventory.ItemInventoryImprinter; import forestry.core.config.Constants; @@ -28,7 +29,6 @@ import forestry.core.gui.GuiUtil; import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.plugins.PluginApiculture; public class GuiImprinter extends GuiForestry { diff --git a/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java b/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java index 31c3f2482..7eb40d1de 100644 --- a/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java +++ b/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java @@ -14,10 +14,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.apiculture.multiblock.TileAlvearySieve; +import forestry.core.PluginCore; import forestry.core.inventory.InventoryAdapterTile; import forestry.core.inventory.watchers.ISlotPickupWatcher; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginCore; public class InventoryAlvearySieve extends InventoryAdapterTile implements ISlotPickupWatcher { public static final int SLOT_POLLEN_1 = 0; diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java index fdfe7c8ca..9cd7f4853 100644 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java +++ b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java @@ -24,13 +24,13 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBee; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.HabitatLocatorLogic; import forestry.apiculture.items.ItemHabitatLocator; import forestry.core.config.Config; import forestry.core.errors.EnumErrorCode; import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventory; -import forestry.plugins.PluginApiculture; public class ItemInventoryHabitatLocator extends ItemInventory implements IErrorSource, IHintSource { diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index 64330ffec..aae3ac947 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -25,8 +25,8 @@ import forestry.api.core.IArmorNaturalist; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; +import forestry.apiculture.PluginApiculture; import forestry.core.config.Constants; -import forestry.plugins.PluginApiculture; public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArmorNaturalist, IItemModelRegister { diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java index 05e7bb317..3a8ec483c 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index 32320d870..d487d947c 100755 --- a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -40,6 +40,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.blocks.BlockTypeApiculture; import forestry.apiculture.flowers.Flower; import forestry.apiculture.flowers.FlowerRegistry; @@ -49,6 +50,7 @@ import forestry.arboriculture.worldgen.BlockTypeLog; import forestry.arboriculture.worldgen.BlockTypeVanillaStairs; import forestry.arboriculture.worldgen.BlockTypeWood; import forestry.arboriculture.worldgen.BlockTypeWoodStairs; +import forestry.core.PluginCore; import forestry.core.blocks.BlockTypeCoreTesr; import forestry.core.config.Constants; import forestry.core.tiles.TileUtil; @@ -56,8 +58,6 @@ import forestry.core.worldgen.BlockType; import forestry.core.worldgen.BlockTypeTileForestry; import forestry.core.worldgen.IBlockType; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginApiculture; -import forestry.plugins.PluginCore; public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index 61bdc5fea..23624157f 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -27,9 +27,9 @@ import net.minecraftforge.event.terraingen.TerrainGen; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.apiculture.PluginApiculture; import forestry.core.config.Config; import forestry.core.config.Constants; -import forestry.plugins.PluginApiculture; public abstract class HiveDecorator { diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index 946e7db32..da72d7ec6 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -27,8 +27,8 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.genetics.BeeDefinition; -import forestry.plugins.PluginApiculture; public enum HiveDescription implements IHiveDescription { diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java index 447a2df1e..1c46da788 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java @@ -22,8 +22,8 @@ import forestry.api.apiculture.hives.IHiveDescription; import forestry.api.apiculture.hives.IHiveGen; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.tiles.TileSwarm; -import forestry.plugins.PluginApiculture; public class HiveDescriptionSwarmer implements IHiveDescription { diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java similarity index 99% rename from src/main/java/forestry/plugins/PluginArboriculture.java rename to src/main/java/forestry/arboriculture/PluginArboriculture.java index 6db155720..29e853f4f 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.arboriculture; import java.util.ArrayList; import java.util.Arrays; @@ -41,8 +41,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodItemAccess; import forestry.arboriculture.blocks.BlockFruitPod; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.blocks.BlockTypeArboricultureTesr; @@ -63,6 +61,7 @@ import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TileSapling; import forestry.arboriculture.tiles.TileWood; +import forestry.core.PluginCore; import forestry.core.blocks.BlockTypeCoreTesr; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; @@ -73,6 +72,9 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; import forestry.factory.recipes.FabricatorRecipe; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description") public class PluginArboriculture extends BlankForestryPlugin { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index a12191490..28af13571 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -41,11 +41,11 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemBlockWood.WoodMeshDefinition; import forestry.arboriculture.tiles.TileWood; import forestry.core.render.ParticleHelper; -import forestry.plugins.PluginArboriculture; public class BlockArbFence extends BlockFence implements IWoodTyped, IItemModelRegister, ITileEntityProvider { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java index d22fa07f1..c921741cb 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java @@ -40,11 +40,11 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemBlockWood.WoodMeshDefinition; import forestry.arboriculture.tiles.TileWood; import forestry.core.render.ParticleHelper; -import forestry.plugins.PluginArboriculture; public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyped, IItemModelRegister, ITileEntityProvider { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 3d22a02e7..f46817dbb 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -41,6 +41,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.world.ITreeGenData; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.blocks.BlockForestryLeaves; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; @@ -89,7 +90,6 @@ import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.genetics.alleles.EnumAllele; import forestry.core.utils.BlockUtil; -import forestry.plugins.PluginArboriculture; public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { Oak(TreeBranchDefinition.QUERCUS, "appleOak", "robur", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), 0, new ItemStack(Blocks.log, 1, 0)) { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index 434060e9f..401d44af4 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -50,13 +50,13 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.blocks.BlockFruitPod; import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileSapling; import forestry.core.config.Constants; import forestry.core.genetics.SpeciesRoot; import forestry.core.utils.BlockUtil; -import forestry.plugins.PluginArboriculture; public class TreeRoot extends SpeciesRoot implements ITreeRoot { diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 4c371f185..34333302b 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -31,6 +31,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IFruitFamily; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.TreeGenome; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.inventory.ItemInventoryTreealyzer; @@ -40,7 +41,6 @@ import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; -import forestry.plugins.PluginArboriculture; public class GuiTreealyzer extends GuiAlyzer { diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index 8f6a127c9..09176732d 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -19,11 +19,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.items.ItemBlockForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.plugins.PluginArboriculture; public class ItemBlockLeaves extends ItemBlockForestry { diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index e45220f5e..aa566ae3e 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -13,10 +13,10 @@ package forestry.arboriculture.proxy; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.world.ColorizerFoliage; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.render.ModelLeaves; import forestry.core.models.BlockModelIndex; import forestry.core.proxy.Proxies; -import forestry.plugins.PluginArboriculture; public class ProxyArboricultureClient extends ProxyArboriculture { @Override diff --git a/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java b/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java index 3b3134a84..960d48b16 100644 --- a/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java +++ b/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java @@ -16,7 +16,7 @@ import net.minecraft.util.ResourceLocation; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.core.IModelManager; -import forestry.plugins.PluginArboriculture; +import forestry.arboriculture.PluginArboriculture; public class ModelProviderGermling implements IGermlingModelProvider { diff --git a/src/main/java/forestry/arboriculture/tiles/TileWood.java b/src/main/java/forestry/arboriculture/tiles/TileWood.java index d85a5bbd2..4ae135831 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileWood.java +++ b/src/main/java/forestry/arboriculture/tiles/TileWood.java @@ -23,6 +23,7 @@ import net.minecraft.world.IBlockAccess; import forestry.api.arboriculture.EnumWoodType; import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.blocks.BlockSlab; import forestry.arboriculture.items.ItemBlockWood; import forestry.core.network.DataInputStreamForestry; @@ -30,7 +31,6 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.packets.PacketTileStream; import forestry.core.tiles.TileUtil; -import forestry.plugins.PluginArboriculture; public class TileWood extends TileEntity implements IStreamable { private EnumWoodType woodType; diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index de05b3e19..f6ecef77f 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -19,7 +19,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginCore; public class CreativeTabForestry extends CreativeTabs { diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/core/PluginCore.java similarity index 98% rename from src/main/java/forestry/plugins/PluginCore.java rename to src/main/java/forestry/core/PluginCore.java index 92ba97502..aa52755e4 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.core; import javax.annotation.Nonnull; import java.util.Collections; @@ -34,10 +34,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.multiblock.MultiblockManager; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.core.IPickupHandler; -import forestry.core.ISaveEventHandler; -import forestry.core.PickupHandlerCore; -import forestry.core.SaveEventHandlerCore; import forestry.core.blocks.BlockRegistryCore; import forestry.core.blocks.BlockResourceOre; import forestry.core.blocks.BlockResourceStorage; @@ -63,6 +59,9 @@ import forestry.core.network.PacketRegistryCore; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.CORE, name = "Core", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.core.description") public class PluginCore extends BlankForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/core/PluginFluids.java similarity index 97% rename from src/main/java/forestry/plugins/PluginFluids.java rename to src/main/java/forestry/core/PluginFluids.java index 6751b286e..5506a3850 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/core/PluginFluids.java @@ -1,181 +1,184 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.fuels.FuelManager; -import forestry.api.fuels.GeneratorFuel; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Config; -import forestry.core.config.Constants; -import forestry.core.fluids.BlockForestryFluid; -import forestry.core.fluids.Fluids; -import forestry.core.fluids.LiquidRegistryHelper; -import forestry.core.items.EnumContainerType; -import forestry.core.items.ItemLiquidContainer; -import forestry.core.items.ItemRegistryFluids; -import forestry.core.proxy.Proxies; -import forestry.core.utils.BlockUtil; -import forestry.core.utils.Log; -import forestry.core.utils.StringUtil; - -@ForestryPlugin(pluginID = ForestryPluginUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.fluids.description") -public class PluginFluids extends BlankForestryPlugin { - - private static final List forestryFluidsWithBlocks = new ArrayList<>(); - - public static ItemRegistryFluids items; - - private static void createFluid(Fluids forestryFluid) { - if (forestryFluid.getFluid() == null && Config.isFluidEnabled(forestryFluid)) { - String fluidName = forestryFluid.getTag(); - if (!FluidRegistry.isFluidRegistered(fluidName)) { - Fluid fluid = new Fluid(fluidName, - forestryFluid.getResources()[0], forestryFluid.flowTextureExists() ? forestryFluid.getResources()[1] - : forestryFluid.getResources()[0]).setDensity(forestryFluid.getDensity()).setViscosity(forestryFluid.getViscosity()).setTemperature(forestryFluid.getTemperature()); - FluidRegistry.registerFluid(fluid); - createBlock(forestryFluid); - } - } - } - - private static void createBlock(Fluids forestryFluid) { - Fluid fluid = forestryFluid.getFluid(); - Block fluidBlock = fluid.getBlock(); - - if (Config.isBlockEnabled(forestryFluid.getTag())) { - if (fluidBlock == null) { - fluidBlock = forestryFluid.makeBlock(); - if (fluidBlock != null) { - fluidBlock.setUnlocalizedName("forestry.fluid." + forestryFluid.getTag()); - GameRegistry.registerBlock(fluidBlock, ItemBlock.class, StringUtil.cleanBlockName(fluidBlock)); - forestryFluidsWithBlocks.add(forestryFluid); - Proxies.render.registerFluidStateMapper(fluidBlock, forestryFluid); - } - } else { - GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock); - Log.warning("Pre-existing {0} fluid block detected, deferring to {1}:{2}, " - + "this may cause issues if the server/client have different mod load orders, " - + "recommended that you disable all but one instance of {0} fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name); - } - } - } - - @Override - public boolean canBeDisabled() { - return false; - } - - @Override - public void registerItemsAndBlocks() { - for (Fluids fluidType : Fluids.forestryFluids) { - createFluid(fluidType); - } - - items = new ItemRegistryFluids(); - } - - @Override - public void preInit() { - MinecraftForge.EVENT_BUS.register(getFillBucketHook()); - } - - @Override - public void doInit() { - for (Fluids fluidType : Fluids.values()) { - if (fluidType.getFluid() == null) { - continue; - } - - for (EnumContainerType type : EnumContainerType.values()) { - ItemLiquidContainer container = items.getContainer(type, fluidType); - if (container == null) { - continue; - } - - LiquidRegistryHelper.registerLiquidContainer(fluidType, container.getItemStack()); - } - - for (ItemStack filledContainer : fluidType.getOtherContainers()) { - LiquidRegistryHelper.registerLiquidContainer(fluidType, filledContainer); - } - } - - if (RecipeManagers.squeezerManager != null) { - RecipeManagers.squeezerManager.addContainerRecipe(10, items.canEmpty.getItemStack(), PluginCore.items.ingotTin.getItemStack(), 0.05f); - RecipeManagers.squeezerManager.addContainerRecipe(10, items.waxCapsuleEmpty.getItemStack(), PluginCore.items.beeswax.getItemStack(), 0.10f); - RecipeManagers.squeezerManager.addContainerRecipe(10, items.refractoryEmpty.getItemStack(), PluginCore.items.refractoryWax.getItemStack(), 0.10f); - } - - FluidStack ethanol = Fluids.ETHANOL.getFluid(1); - GeneratorFuel ethanolFuel = new GeneratorFuel(ethanol, (int) (32 * ForestryAPI.activeMode.getFloatSetting("fuel.ethanol.generator")), 4); - FuelManager.generatorFuel.put(ethanol.getFluid(), ethanolFuel); - - FluidStack biomass = Fluids.BIOMASS.getFluid(1); - GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.generator")), 1); - FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel); - } - - public static class MissingFluidException extends RuntimeException { - public MissingFluidException(String tag) { - super("Fluid '" + tag + "' was not found. Please check your configs."); - } - } - - @Override - public void postInit() { - for (Fluids fluidType : Fluids.forestryFluids) { - if (fluidType.getFluid() == null && Config.isFluidEnabled(fluidType)) { - throw new MissingFluidException(fluidType.getTag()); - } - } - } - - public static class FillBucketHook { - @SubscribeEvent - public void fillBucket(FillBucketEvent event) { - MovingObjectPosition movingObjectPosition = event.target; - Block targetedBlock = BlockUtil.getBlock(event.world, event.target.getBlockPos()); - if (targetedBlock instanceof BlockForestryFluid) { - Item filledBucket = ItemLiquidContainer.getExistingBucket(targetedBlock); - if (filledBucket != null) { - event.result = new ItemStack(filledBucket); - event.setResult(Event.Result.ALLOW); - if (!event.world.isRemote) { - event.world.setBlockToAir(event.target.getBlockPos()); - } - } - } - } - } - - private static Object getFillBucketHook() { - return new FillBucketHook(); - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +import forestry.api.core.ForestryAPI; +import forestry.api.fuels.FuelManager; +import forestry.api.fuels.GeneratorFuel; +import forestry.api.recipes.RecipeManagers; +import forestry.core.config.Config; +import forestry.core.config.Constants; +import forestry.core.fluids.BlockForestryFluid; +import forestry.core.fluids.Fluids; +import forestry.core.fluids.LiquidRegistryHelper; +import forestry.core.items.EnumContainerType; +import forestry.core.items.ItemLiquidContainer; +import forestry.core.items.ItemRegistryFluids; +import forestry.core.proxy.Proxies; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.Log; +import forestry.core.utils.StringUtil; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; + +@ForestryPlugin(pluginID = ForestryPluginUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.fluids.description") +public class PluginFluids extends BlankForestryPlugin { + + private static final List forestryFluidsWithBlocks = new ArrayList<>(); + + public static ItemRegistryFluids items; + + private static void createFluid(Fluids forestryFluid) { + if (forestryFluid.getFluid() == null && Config.isFluidEnabled(forestryFluid)) { + String fluidName = forestryFluid.getTag(); + if (!FluidRegistry.isFluidRegistered(fluidName)) { + Fluid fluid = new Fluid(fluidName, + forestryFluid.getResources()[0], forestryFluid.flowTextureExists() ? forestryFluid.getResources()[1] + : forestryFluid.getResources()[0]).setDensity(forestryFluid.getDensity()).setViscosity(forestryFluid.getViscosity()).setTemperature(forestryFluid.getTemperature()); + FluidRegistry.registerFluid(fluid); + createBlock(forestryFluid); + } + } + } + + private static void createBlock(Fluids forestryFluid) { + Fluid fluid = forestryFluid.getFluid(); + Block fluidBlock = fluid.getBlock(); + + if (Config.isBlockEnabled(forestryFluid.getTag())) { + if (fluidBlock == null) { + fluidBlock = forestryFluid.makeBlock(); + if (fluidBlock != null) { + fluidBlock.setUnlocalizedName("forestry.fluid." + forestryFluid.getTag()); + GameRegistry.registerBlock(fluidBlock, ItemBlock.class, StringUtil.cleanBlockName(fluidBlock)); + forestryFluidsWithBlocks.add(forestryFluid); + Proxies.render.registerFluidStateMapper(fluidBlock, forestryFluid); + } + } else { + GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock); + Log.warning("Pre-existing {0} fluid block detected, deferring to {1}:{2}, " + + "this may cause issues if the server/client have different mod load orders, " + + "recommended that you disable all but one instance of {0} fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name); + } + } + } + + @Override + public boolean canBeDisabled() { + return false; + } + + @Override + public void registerItemsAndBlocks() { + for (Fluids fluidType : Fluids.forestryFluids) { + createFluid(fluidType); + } + + items = new ItemRegistryFluids(); + } + + @Override + public void preInit() { + MinecraftForge.EVENT_BUS.register(getFillBucketHook()); + } + + @Override + public void doInit() { + for (Fluids fluidType : Fluids.values()) { + if (fluidType.getFluid() == null) { + continue; + } + + for (EnumContainerType type : EnumContainerType.values()) { + ItemLiquidContainer container = items.getContainer(type, fluidType); + if (container == null) { + continue; + } + + LiquidRegistryHelper.registerLiquidContainer(fluidType, container.getItemStack()); + } + + for (ItemStack filledContainer : fluidType.getOtherContainers()) { + LiquidRegistryHelper.registerLiquidContainer(fluidType, filledContainer); + } + } + + if (RecipeManagers.squeezerManager != null) { + RecipeManagers.squeezerManager.addContainerRecipe(10, items.canEmpty.getItemStack(), PluginCore.items.ingotTin.getItemStack(), 0.05f); + RecipeManagers.squeezerManager.addContainerRecipe(10, items.waxCapsuleEmpty.getItemStack(), PluginCore.items.beeswax.getItemStack(), 0.10f); + RecipeManagers.squeezerManager.addContainerRecipe(10, items.refractoryEmpty.getItemStack(), PluginCore.items.refractoryWax.getItemStack(), 0.10f); + } + + FluidStack ethanol = Fluids.ETHANOL.getFluid(1); + GeneratorFuel ethanolFuel = new GeneratorFuel(ethanol, (int) (32 * ForestryAPI.activeMode.getFloatSetting("fuel.ethanol.generator")), 4); + FuelManager.generatorFuel.put(ethanol.getFluid(), ethanolFuel); + + FluidStack biomass = Fluids.BIOMASS.getFluid(1); + GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.generator")), 1); + FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel); + } + + public static class MissingFluidException extends RuntimeException { + public MissingFluidException(String tag) { + super("Fluid '" + tag + "' was not found. Please check your configs."); + } + } + + @Override + public void postInit() { + for (Fluids fluidType : Fluids.forestryFluids) { + if (fluidType.getFluid() == null && Config.isFluidEnabled(fluidType)) { + throw new MissingFluidException(fluidType.getTag()); + } + } + } + + public static class FillBucketHook { + @SubscribeEvent + public void fillBucket(FillBucketEvent event) { + MovingObjectPosition movingObjectPosition = event.target; + Block targetedBlock = BlockUtil.getBlock(event.world, event.target.getBlockPos()); + if (targetedBlock instanceof BlockForestryFluid) { + Item filledBucket = ItemLiquidContainer.getExistingBucket(targetedBlock); + if (filledBucket != null) { + event.result = new ItemStack(filledBucket); + event.setResult(Event.Result.ALLOW); + if (!event.world.isRemote) { + event.world.setBlockToAir(event.target.getBlockPos()); + } + } + } + } + } + + private static Object getFillBucketHook() { + return new FillBucketHook(); + } +} diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java index e0735dfb0..019c79a80 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -34,7 +34,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; -import forestry.plugins.PluginCore; +import forestry.core.PluginCore; public class BlockResourceOre extends Block implements IItemModelRegister { private static final PropertyEnum RESOURCE = PropertyEnum.create("resource", ResourceType.class); diff --git a/src/main/java/forestry/core/blocks/BlockSoil.java b/src/main/java/forestry/core/blocks/BlockSoil.java index 0d65d6bda..4f2a4f64f 100644 --- a/src/main/java/forestry/core/blocks/BlockSoil.java +++ b/src/main/java/forestry/core/blocks/BlockSoil.java @@ -40,9 +40,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.utils.BlockUtil; -import forestry.plugins.PluginCore; /** * Humus, bog earth, peat diff --git a/src/main/java/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java index 003a49f17..e6c4da321 100755 --- a/src/main/java/forestry/core/circuits/CircuitRegistry.java +++ b/src/main/java/forestry/core/circuits/CircuitRegistry.java @@ -23,7 +23,7 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitLibrary; import forestry.api.circuits.ICircuitRegistry; -import forestry.plugins.PluginCore; +import forestry.core.PluginCore; public class CircuitRegistry implements ICircuitRegistry { diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java index d4f7ab83d..7b4823520 100755 --- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java +++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java @@ -27,8 +27,8 @@ import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.IModelManager; +import forestry.core.PluginCore; import forestry.core.items.ItemForestry; -import forestry.plugins.PluginCore; public class ItemCircuitBoard extends ItemForestry { diff --git a/src/main/java/forestry/core/config/GameMode.java b/src/main/java/forestry/core/config/GameMode.java index f88d2e6e5..5f4f06a67 100644 --- a/src/main/java/forestry/core/config/GameMode.java +++ b/src/main/java/forestry/core/config/GameMode.java @@ -19,10 +19,10 @@ import net.minecraft.item.ItemStack; import forestry.Forestry; import forestry.api.core.IGameMode; +import forestry.core.PluginCore; +import forestry.core.PluginFluids; import forestry.core.blocks.BlockSoil; import forestry.core.utils.Log; -import forestry.plugins.PluginCore; -import forestry.plugins.PluginFluids; public class GameMode implements IGameMode { private static final String GAMEMODE_KEY = "gamemode"; diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 263646596..11bad3a89 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -26,10 +26,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import forestry.core.PluginFluids; import forestry.core.config.Constants; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginFluids; /** * @author CovertJaguar diff --git a/src/main/java/forestry/core/fluids/LiquidRegistryHelper.java b/src/main/java/forestry/core/fluids/LiquidRegistryHelper.java index c5c17d4d8..4929bb798 100644 --- a/src/main/java/forestry/core/fluids/LiquidRegistryHelper.java +++ b/src/main/java/forestry/core/fluids/LiquidRegistryHelper.java @@ -21,11 +21,11 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; +import forestry.core.PluginFluids; import forestry.core.config.Constants; import forestry.core.items.EnumContainerType; import forestry.core.items.ItemLiquidContainer; import forestry.core.utils.Log; -import forestry.plugins.PluginFluids; public class LiquidRegistryHelper { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index 49ef3ab5b..abb53b9bd 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -34,9 +34,9 @@ import forestry.api.genetics.IFruitFamily; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; +import forestry.core.PluginCore; import forestry.core.genetics.Classification; import forestry.core.genetics.ItemResearchNote.EnumNoteType; -import forestry.plugins.PluginCore; public class AlleleRegistry implements IAlleleRegistry { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 9af05fc34..f015e9bb2 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -32,10 +32,10 @@ import forestry.api.genetics.IAlleleSpeciesBuilder; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginApiculture; public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuilder, IAlleleSpecies { private final String binomial; diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 6a37be6d6..3e7aebaf2 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -23,10 +23,10 @@ import forestry.api.core.IErrorState; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.errors.EnumErrorCode; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginApiculture; public abstract class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { public static final int SLOT_SPECIMEN = 0; diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index ed066b127..c54f555a0 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; -import forestry.plugins.PluginCore; +import forestry.core.PluginCore; public class ItemFruit extends ItemForestryFood { diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index 12bd30b25..51b5e8ed7 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -50,7 +50,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.ItemCrated; import forestry.core.utils.StringUtil; -import forestry.plugins.PluginStorage; +import forestry.storage.PluginStorage; import gnu.trove.map.hash.TIntObjectHashMap; diff --git a/src/main/java/forestry/core/utils/EntityUtil.java b/src/main/java/forestry/core/utils/EntityUtil.java index c400008dc..ecab24acb 100644 --- a/src/main/java/forestry/core/utils/EntityUtil.java +++ b/src/main/java/forestry/core/utils/EntityUtil.java @@ -10,19 +10,15 @@ ******************************************************************************/ package forestry.core.utils; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.EntityRegistry; import forestry.api.core.ForestryAPI; -import forestry.core.entities.EntitySelector; public abstract class EntityUtil { public static E spawnEntity(World world, Class entityClass, double x, double y, double z) { diff --git a/src/main/java/forestry/core/worldgen/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java index eb35b94c1..d801319ae 100644 --- a/src/main/java/forestry/core/worldgen/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -21,9 +21,9 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.fml.common.IWorldGenerator; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import forestry.core.PluginCore; import forestry.core.blocks.BlockResourceOre; import forestry.core.config.Config; -import forestry.plugins.PluginCore; import forestry.plugins.PluginManager; public class WorldGenerator implements IWorldGenerator { diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/energy/PluginEnergy.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/forestry/plugins/PluginEnergy.java rename to src/main/java/forestry/energy/PluginEnergy.java index 6b646cfa3..e290ef8ab --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/energy/PluginEnergy.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.energy; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -21,6 +21,9 @@ import forestry.core.recipes.RecipeUtil; import forestry.energy.blocks.BlockRegistryEnergy; import forestry.energy.blocks.BlockTypeEngine; import forestry.energy.proxy.ProxyEnergy; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.ENERGY, name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.energy.description") public class PluginEnergy extends BlankForestryPlugin { diff --git a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java index f2a1bb304..e9ecfdfd3 100644 --- a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java @@ -18,10 +18,10 @@ import forestry.core.blocks.IBlockTypeTesr; import forestry.core.blocks.IMachinePropertiesTesr; import forestry.core.config.Constants; import forestry.core.tiles.TileEngine; +import forestry.energy.PluginEnergy; import forestry.energy.tiles.TileEngineBiogas; import forestry.energy.tiles.TileEngineClockwork; import forestry.energy.tiles.TileEnginePeat; -import forestry.plugins.PluginEnergy; public enum BlockTypeEngine implements IBlockTypeTesr { PEAT(0, TileEnginePeat.class, "peat", "/engine_copper_"), diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index d4fffbd3a..ee65f8b65 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -27,6 +27,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional; import forestry.api.fuels.FuelManager; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.AdjacentInventoryCache; @@ -40,7 +41,6 @@ import forestry.energy.gui.ContainerEnginePeat; import forestry.energy.gui.GuiEnginePeat; import forestry.energy.inventory.InventoryEnginePeat; import forestry.factory.triggers.FactoryTriggers; -import forestry.plugins.PluginCore; import buildcraft.api.statements.ITriggerExternal; diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java similarity index 98% rename from src/main/java/forestry/plugins/PluginFactory.java rename to src/main/java/forestry/factory/PluginFactory.java index d3430bf4d..ed6b74ab5 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.factory; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,7 +27,10 @@ import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.api.recipes.RecipeManagers; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.PluginCore; +import forestry.core.PluginFluids; import forestry.core.blocks.BlockSoil; import forestry.core.blocks.BlockTypeCoreTesr; import forestry.core.circuits.Circuit; @@ -43,7 +46,6 @@ import forestry.core.network.IPacketRegistry; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.datastructures.FluidMap; import forestry.core.utils.datastructures.ItemStackMap; -import forestry.factory.DummyManagers; import forestry.factory.blocks.BlockRegistryFactory; import forestry.factory.blocks.BlockTypeFactoryPlain; import forestry.factory.blocks.BlockTypeFactoryTesr; @@ -58,6 +60,10 @@ import forestry.factory.recipes.MoistenerRecipeManager; import forestry.factory.recipes.SqueezerRecipeManager; import forestry.factory.recipes.StillRecipeManager; import forestry.factory.triggers.FactoryTriggers; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; +import forestry.storage.PluginStorage; @ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description") public class PluginFactory extends BlankForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java similarity index 98% rename from src/main/java/forestry/plugins/PluginFarming.java rename to src/main/java/forestry/farming/PluginFarming.java index 53cac9409..662f676f2 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.farming; import java.util.ArrayList; import java.util.Collection; @@ -40,6 +40,7 @@ import forestry.api.circuits.ICircuitLayout; import forestry.api.core.ForestryAPI; import forestry.api.farming.Farmables; import forestry.api.farming.IFarmable; +import forestry.core.PluginCore; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; @@ -78,6 +79,9 @@ import forestry.farming.tiles.TileFarmHatch; import forestry.farming.tiles.TileFarmPlain; import forestry.farming.tiles.TileFarmValve; import forestry.farming.triggers.FarmingTriggers; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.FARMING, name = "Farming", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.farming.description") public class PluginFarming extends BlankForestryPlugin { diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index f417a963e..6e0202579 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -19,10 +19,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.core.PluginCore; import forestry.core.blocks.BlockSoil; import forestry.core.proxy.Proxies; import forestry.core.utils.vect.Vect; -import forestry.plugins.PluginCore; public class CropPeat extends Crop { diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index 9e41a40b7..69e216f0c 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -33,10 +33,10 @@ import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; +import forestry.core.PluginCore; import forestry.core.blocks.BlockSoil; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; -import forestry.plugins.PluginCore; public class FarmLogicArboreal extends FarmLogicHomogeneous { private static final int BRANCH_RANGE = 20; diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index a44fd8e20..8db4c1813 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -36,9 +36,9 @@ import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.api.genetics.IFruitBearer; +import forestry.core.PluginCore; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; -import forestry.plugins.PluginCore; public class FarmLogicOrchard extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index a0ad81627..1356c38c3 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -25,10 +25,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; +import forestry.core.PluginCore; import forestry.core.blocks.BlockSoil; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; -import forestry.plugins.PluginCore; public class FarmLogicPeat extends FarmLogicWatered { private static final ItemStack bogEarth = PluginCore.blocks.soil.get(BlockSoil.SoilType.BOG_EARTH, 1); diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index 3d28b7374..1a0dff9cd 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -20,10 +20,10 @@ import net.minecraft.world.World; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.TreeGenome; import forestry.core.utils.BlockUtil; import forestry.core.utils.vect.Vect; -import forestry.plugins.PluginArboriculture; public class FarmableGE implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java index 18c5b4cab..899b1600a 100644 --- a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java @@ -23,7 +23,7 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; -import forestry.plugins.PluginFarming; +import forestry.farming.PluginFarming; public class FarmableVanillaMushroom extends FarmableGenericSapling { diff --git a/src/main/java/forestry/farming/multiblock/InventoryFarm.java b/src/main/java/forestry/farming/multiblock/InventoryFarm.java index 505757c01..ec0626e97 100644 --- a/src/main/java/forestry/farming/multiblock/InventoryFarm.java +++ b/src/main/java/forestry/farming/multiblock/InventoryFarm.java @@ -25,6 +25,7 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmInventory; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; +import forestry.core.PluginCore; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.inventory.InventoryAdapterRestricted; @@ -32,7 +33,6 @@ import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.utils.InventoryUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.SlotUtil; -import forestry.plugins.PluginCore; public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory { public static final int SLOT_RESOURCES_1 = 0; diff --git a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java index 387a62b29..46a000b1b 100644 --- a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java @@ -14,8 +14,8 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import forestry.core.models.BlockModelIndex; import forestry.core.proxy.Proxies; +import forestry.farming.PluginFarming; import forestry.farming.models.ModelFarmBlock; -import forestry.plugins.PluginFarming; public class ProxyFarmingClient extends ProxyFarming { diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/food/PluginFood.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/plugins/PluginFood.java rename to src/main/java/forestry/food/PluginFood.java index 4b92b3007..e250e6a2a --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/food/PluginFood.java @@ -8,23 +8,24 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.food; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import forestry.api.food.BeverageManager; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.EnumPollenCluster; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.fluids.LiquidRegistryHelper; import forestry.core.recipes.RecipeUtil; -import forestry.food.BeverageEffects; -import forestry.food.InfuserIngredientManager; -import forestry.food.InfuserMixtureManager; import forestry.food.items.EnumBeverage; import forestry.food.items.ItemRegistryFood; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.FOOD, name = "Food", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.food.description") public class PluginFood extends BlankForestryPlugin { diff --git a/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java b/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java index 6f4d66186..b3a05dd9a 100644 --- a/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java +++ b/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; import forestry.api.food.BeverageManager; import forestry.core.inventory.ItemInventory; -import forestry.plugins.PluginFood; +import forestry.food.PluginFood; public class ItemInventoryInfuser extends ItemInventory { private static final short inputSlot = 0; diff --git a/src/main/java/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java index cd967bd17..644268d02 100755 --- a/src/main/java/forestry/lepidopterology/ButterflySpawner.java +++ b/src/main/java/forestry/lepidopterology/ButterflySpawner.java @@ -19,7 +19,6 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.core.utils.Log; import forestry.lepidopterology.entities.EntityButterfly; -import forestry.plugins.PluginLepidopterology; public class ButterflySpawner implements ILeafTickHandler { diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/plugins/PluginLepidopterology.java rename to src/main/java/forestry/lepidopterology/PluginLepidopterology.java index 1d2fca7d8..1b2c709ff --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.lepidopterology; import javax.annotation.Nonnull; import java.io.File; @@ -31,12 +31,12 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.recipes.RecipeManagers; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.EntityUtil; -import forestry.lepidopterology.ButterflySpawner; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr; import forestry.lepidopterology.commands.CommandButterfly; @@ -51,6 +51,9 @@ import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemRegistryLepidopterology; import forestry.lepidopterology.proxy.ProxyLepidopterology; import forestry.lepidopterology.recipes.MatingRecipe; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.LEPIDOPTEROLOGY, name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.lepidopterology.description") public class PluginLepidopterology extends BlankForestryPlugin { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index 8bfa2cf8e..98e7b7f7a 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -13,7 +13,7 @@ package forestry.lepidopterology.entities; import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.utils.GeneticsUtil; -import forestry.plugins.PluginLepidopterology; +import forestry.lepidopterology.PluginLepidopterology; public class AIButterflyMate extends AIButterflyInteract { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java index 334400f28..22f1e14f6 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java @@ -14,7 +14,7 @@ import forestry.api.genetics.IPollinatable; import forestry.arboriculture.genetics.pollination.FakePollinatable; import forestry.arboriculture.genetics.pollination.ICheckPollinatable; import forestry.core.utils.GeneticsUtil; -import forestry.plugins.PluginLepidopterology; +import forestry.lepidopterology.PluginLepidopterology; public class AIButterflyPollinate extends AIButterflyInteract { diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index 31c3b27f4..dcdbcf123 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -39,8 +39,8 @@ import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.genetics.SpeciesRoot; import forestry.core.utils.EntityUtil; +import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; -import forestry.plugins.PluginLepidopterology; public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 7583f287a..b92bae60b 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -29,9 +29,9 @@ import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; +import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; -import forestry.plugins.PluginLepidopterology; public class GuiFlutterlyzer extends GuiAlyzer { diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index abe971b40..d67312b1d 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -42,9 +42,9 @@ import forestry.core.genetics.ItemGE; import forestry.core.network.packets.PacketFXSignal; import forestry.core.proxy.Proxies; import forestry.core.utils.EntityUtil; +import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; -import forestry.plugins.PluginLepidopterology; public class ItemButterflyGE extends ItemGE { diff --git a/src/main/java/forestry/mail/LetterProperties.java b/src/main/java/forestry/mail/LetterProperties.java index 7da66df58..b599998ae 100644 --- a/src/main/java/forestry/mail/LetterProperties.java +++ b/src/main/java/forestry/mail/LetterProperties.java @@ -26,7 +26,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; import forestry.api.mail.ILetter; import forestry.mail.items.ItemLetter; -import forestry.plugins.PluginMail; public class LetterProperties { private enum State { diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/mail/PluginMail.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/plugins/PluginMail.java rename to src/main/java/forestry/mail/PluginMail.java index 541a6c8ff..ada2881a7 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/mail/PluginMail.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.mail; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -18,8 +18,10 @@ import net.minecraftforge.common.MinecraftForge; import forestry.api.mail.EnumAddressee; import forestry.api.mail.PostManager; import forestry.api.recipes.RecipeManagers; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.ISaveEventHandler; +import forestry.core.PluginCore; import forestry.core.circuits.EnumCircuitBoardType; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -27,10 +29,6 @@ import forestry.core.fluids.Fluids; import forestry.core.items.EnumElectronTube; import forestry.core.network.IPacketRegistry; import forestry.core.recipes.RecipeUtil; -import forestry.mail.EventHandlerMailAlert; -import forestry.mail.PostRegistry; -import forestry.mail.PostalCarrier; -import forestry.mail.SaveEventHandlerMail; import forestry.mail.blocks.BlockRegistryMail; import forestry.mail.blocks.BlockTypeMail; import forestry.mail.commands.CommandMail; @@ -38,6 +36,9 @@ import forestry.mail.items.EnumStampDefinition; import forestry.mail.items.ItemRegistryMail; import forestry.mail.network.PacketRegistryMail; import forestry.mail.triggers.MailTriggers; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; @ForestryPlugin(pluginID = ForestryPluginUids.MAIL, name = "Mail", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.mail.description") public class PluginMail extends BlankForestryPlugin { diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index f6d8d2eda..4fc83c57e 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -28,7 +28,6 @@ import forestry.api.mail.IStamps; import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.mail.items.EnumStampDefinition; -import forestry.plugins.PluginMail; public class PostOffice extends WorldSavedData implements IPostOffice { diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 9dcee233d..cf61defed 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -33,7 +33,6 @@ import forestry.api.mail.PostManager; import forestry.core.proxy.Proxies; import forestry.core.utils.PlayerUtil; import forestry.mail.network.packets.PacketPOBoxInfoUpdate; -import forestry.plugins.PluginMail; public class PostRegistry implements IPostRegistry { diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index cdbe7db2d..103a387e0 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -39,7 +39,6 @@ import forestry.core.utils.PlayerUtil; import forestry.core.utils.StringUtil; import forestry.mail.inventory.InventoryTradeStation; import forestry.mail.items.EnumStampDefinition; -import forestry.plugins.PluginMail; public class TradeStation extends WorldSavedData implements ITradeStation, IInventoryAdapter { public static final String SAVE_NAME = "TradePO_"; diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 22aa8be0d..8bf987a9d 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -46,6 +46,7 @@ import forestry.api.core.ForestryAPI; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; +import forestry.core.PluginCore; import forestry.core.network.IPacketRegistry; import forestry.core.utils.Log; diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 966207468..e912c0ba3 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -26,6 +26,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; @@ -38,7 +39,6 @@ import forestry.farming.logic.FarmableGenericSapling; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginCore; @ForestryPlugin(pluginID = ForestryPluginUids.BIOMES_O_PLENTY, name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description") public class PluginBiomesOPlenty extends BlankForestryPlugin { diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java index 3e6159c5f..1c4a31443 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.Log; @@ -22,7 +23,6 @@ import forestry.core.utils.ModUtil; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginCore; @ForestryPlugin(pluginID = ForestryPluginUids.BUILDCRAFT_TRANSPORT, name = "BuildCraft 6 Transport", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftTransport extends BlankForestryPlugin { diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index e56cb9148..ba50e6348 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -29,6 +29,7 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; @@ -38,7 +39,6 @@ import forestry.farming.logic.FarmableGenericCrop; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginCore; @ForestryPlugin(pluginID = ForestryPluginUids.NATURA, name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description") public class PluginNatura extends BlankForestryPlugin { diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index 1862382e4..7657a5b13 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -24,7 +24,6 @@ import forestry.core.models.ModelIndex; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; -import forestry.plugins.PluginStorage; public class CrateRegistry implements ICrateRegistry { diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/plugins/PluginStorage.java rename to src/main/java/forestry/storage/PluginStorage.java index 2ee5d0265..884671cf8 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.storage; import java.awt.Color; import java.io.File; @@ -63,9 +63,11 @@ import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.StorageManager; +import forestry.apiculture.PluginApiculture; import forestry.apiculture.blocks.BlockRegistryApiculture; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; +import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; import forestry.core.fluids.Fluids; @@ -76,15 +78,14 @@ import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; +import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr; -import forestry.storage.BackpackDefinition; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; import forestry.storage.BackpackDefinition.BackpackDefinitionApiarist; import forestry.storage.BackpackDefinition.BackpackDefinitionLepidopterist; -import forestry.storage.BackpackInterface; -import forestry.storage.CrateRegistry; -import forestry.storage.PickupHandlerStorage; -import forestry.storage.ResupplyHandler; import forestry.storage.items.ItemRegistryStorage; @ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description")