diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index 06f9b296d..9b738fc2a 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -28,7 +28,7 @@ import forestry.core.inventory.InventoryAdapter; import forestry.core.network.GuiId; import forestry.core.tiles.TemperatureState; import forestry.core.tiles.TileEngine; -import forestry.plugins.PluginIC2; +import forestry.plugins.compat.PluginIC2; import ic2.api.energy.prefab.BasicSink; diff --git a/src/main/java/forestry/energy/tiles/TileGenerator.java b/src/main/java/forestry/energy/tiles/TileGenerator.java index 8bac39762..37c361303 100644 --- a/src/main/java/forestry/energy/tiles/TileGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileGenerator.java @@ -39,7 +39,7 @@ import forestry.core.tiles.ILiquidTankTile; import forestry.core.tiles.IRenderableTile; import forestry.core.tiles.TileBase; import forestry.energy.inventory.InventoryGenerator; -import forestry.plugins.PluginIC2; +import forestry.plugins.compat.PluginIC2; import ic2.api.energy.prefab.BasicSource; diff --git a/src/main/java/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java index 348296a19..6565da333 100755 --- a/src/main/java/forestry/farming/logic/CropRubber.java +++ b/src/main/java/forestry/farming/logic/CropRubber.java @@ -20,7 +20,7 @@ import net.minecraft.world.World; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.core.utils.vect.Vect; -import forestry.plugins.PluginIC2; +import forestry.plugins.compat.PluginIC2; public class CropRubber extends CropBlock { diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index a2f43b9bc..bfdf229d1 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -33,7 +33,7 @@ import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; -import forestry.plugins.PluginIC2; +import forestry.plugins.compat.PluginIC2; public class FarmLogicRubber extends FarmLogic { diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 3371482d2..98bb57318 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -43,6 +43,24 @@ import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; import forestry.core.utils.Log; +import forestry.plugins.compat.PluginAgriCraft; +import forestry.plugins.compat.PluginBiomesOPlenty; +import forestry.plugins.compat.PluginBuildCraftFuels; +import forestry.plugins.compat.PluginBuildCraftRecipes; +import forestry.plugins.compat.PluginBuildCraftStatements; +import forestry.plugins.compat.PluginBuildCraftTransport; +import forestry.plugins.compat.PluginChisel; +import forestry.plugins.compat.PluginEnderIO; +import forestry.plugins.compat.PluginErebus; +import forestry.plugins.compat.PluginExtraUtilities; +import forestry.plugins.compat.PluginGrowthCraft; +import forestry.plugins.compat.PluginHarvestCraft; +import forestry.plugins.compat.PluginIC2; +import forestry.plugins.compat.PluginImmersiveEngineering; +import forestry.plugins.compat.PluginMagicalCrops; +import forestry.plugins.compat.PluginNatura; +import forestry.plugins.compat.PluginPlantMegaPack; +import forestry.plugins.compat.PluginWitchery; public class PluginManager { diff --git a/src/main/java/forestry/plugins/PluginAgriCraft.java b/src/main/java/forestry/plugins/compat/PluginAgriCraft.java similarity index 94% rename from src/main/java/forestry/plugins/PluginAgriCraft.java rename to src/main/java/forestry/plugins/compat/PluginAgriCraft.java index 48b878bc3..718597748 100644 --- a/src/main/java/forestry/plugins/PluginAgriCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginAgriCraft.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableList; @@ -24,6 +24,9 @@ import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicAgricraft; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginManager; @Plugin(pluginID = "AgriCraft", name = "AgriCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.agricraft.description") public class PluginAgriCraft extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java similarity index 98% rename from src/main/java/forestry/plugins/PluginBiomesOPlenty.java rename to src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 7c75023fb..e0fc2b4bc 100644 --- a/src/main/java/forestry/plugins/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import java.util.ArrayList; import java.util.List; @@ -36,6 +36,9 @@ import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; import forestry.farming.logic.FarmableGenericSapling; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginCore; @Plugin(pluginID = "BiomesOPlenty", name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description") public class PluginBiomesOPlenty extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java similarity index 95% rename from src/main/java/forestry/plugins/PluginBuildCraftFuels.java rename to src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java index f25d4abc3..53e173d28 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import net.minecraftforge.fluids.Fluid; @@ -18,6 +18,8 @@ import forestry.api.core.ForestryAPI; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.ICoolant; diff --git a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java similarity index 93% rename from src/main/java/forestry/plugins/PluginBuildCraftRecipes.java rename to src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java index c55e9bc64..cb4986e85 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java @@ -8,13 +8,15 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import cpw.mods.fml.common.Optional; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; import buildcraft.api.recipes.BuildcraftRecipeRegistry; diff --git a/src/main/java/forestry/plugins/PluginBuildCraftStatements.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java similarity index 96% rename from src/main/java/forestry/plugins/PluginBuildCraftStatements.java rename to src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java index a9b6041d4..86c440d0d 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftStatements.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import java.util.Collection; @@ -20,6 +20,8 @@ import cpw.mods.fml.common.Optional; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/src/main/java/forestry/plugins/PluginBuildCraftTransport.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java similarity index 92% rename from src/main/java/forestry/plugins/PluginBuildCraftTransport.java rename to src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java index aa914087e..9e2acd049 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftTransport.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -19,6 +19,9 @@ import forestry.core.config.Constants; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginCore; @Plugin(pluginID = "BC6|Transport", name = "BuildCraft 6 Transport", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftTransport extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginChisel.java b/src/main/java/forestry/plugins/compat/PluginChisel.java similarity index 93% rename from src/main/java/forestry/plugins/PluginChisel.java rename to src/main/java/forestry/plugins/compat/PluginChisel.java index ef9ca372c..6370d7de1 100644 --- a/src/main/java/forestry/plugins/PluginChisel.java +++ b/src/main/java/forestry/plugins/compat/PluginChisel.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableList; @@ -16,6 +16,8 @@ import cpw.mods.fml.common.event.FMLInterModComms; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; @Plugin(pluginID = "Chisel", name = "Chisel", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.chisel.description") public class PluginChisel extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginEnderIO.java b/src/main/java/forestry/plugins/compat/PluginEnderIO.java similarity index 92% rename from src/main/java/forestry/plugins/PluginEnderIO.java rename to src/main/java/forestry/plugins/compat/PluginEnderIO.java index 53714bc25..23e8a6515 100644 --- a/src/main/java/forestry/plugins/PluginEnderIO.java +++ b/src/main/java/forestry/plugins/compat/PluginEnderIO.java @@ -1,4 +1,4 @@ -package forestry.plugins; +package forestry.plugins.compat; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +10,8 @@ import forestry.api.core.ForestryAPI; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; @Plugin(pluginID = "EnderIO", name = "EnderIO", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.enderIO.description") public class PluginEnderIO extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginErebus.java b/src/main/java/forestry/plugins/compat/PluginErebus.java similarity index 91% rename from src/main/java/forestry/plugins/PluginErebus.java rename to src/main/java/forestry/plugins/compat/PluginErebus.java index 9a88c1a4a..aca378563 100644 --- a/src/main/java/forestry/plugins/PluginErebus.java +++ b/src/main/java/forestry/plugins/compat/PluginErebus.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,6 +22,10 @@ import forestry.apiculture.items.EnumPropolis; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginApiculture; +import forestry.plugins.PluginManager; @Plugin(pluginID = "Erebus", name = "Erebus", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.erebus.description") public class PluginErebus extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginExtraUtilities.java b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java similarity index 93% rename from src/main/java/forestry/plugins/PluginExtraUtilities.java rename to src/main/java/forestry/plugins/compat/PluginExtraUtilities.java index 9e4091d41..ec8cff7a1 100644 --- a/src/main/java/forestry/plugins/PluginExtraUtilities.java +++ b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import java.util.ArrayList; @@ -29,6 +29,10 @@ import forestry.core.utils.ModUtil; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicEnder; import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginCore; +import forestry.plugins.PluginManager; @Plugin(pluginID = "ExtraUtilities", name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.extrautilities.description") public class PluginExtraUtilities extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginGrowthCraft.java b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java similarity index 96% rename from src/main/java/forestry/plugins/PluginGrowthCraft.java rename to src/main/java/forestry/plugins/compat/PluginGrowthCraft.java index 670a92d5c..012a1477b 100644 --- a/src/main/java/forestry/plugins/PluginGrowthCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableMap; @@ -26,6 +26,11 @@ import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicGrowthCraft; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginApiculture; +import forestry.plugins.PluginCore; +import forestry.plugins.PluginManager; @Plugin(pluginID = "Growthcraft", name = "Growthcraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.growthcraft.description") public class PluginGrowthCraft extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java similarity index 98% rename from src/main/java/forestry/plugins/PluginHarvestCraft.java rename to src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index 9ed24339e..9e238c3cf 100644 --- a/src/main/java/forestry/plugins/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableList; @@ -29,6 +29,9 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginCore; @Plugin(pluginID = "HarvestCraft", name = "HarvestCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.harvestcraft.description") public class PluginHarvestCraft extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java similarity index 97% rename from src/main/java/forestry/plugins/PluginIC2.java rename to src/main/java/forestry/plugins/compat/PluginIC2.java index 9a5c50e0e..4d7ce99dc 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableMap; @@ -59,6 +59,12 @@ import forestry.energy.tiles.TileEngineElectric; import forestry.energy.tiles.TileGenerator; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicRubber; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginApiculture; +import forestry.plugins.PluginCore; +import forestry.plugins.PluginEnergy; +import forestry.plugins.PluginManager; import ic2.api.item.IC2Items; import ic2.api.recipe.RecipeInputItemStack; diff --git a/src/main/java/forestry/plugins/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java similarity index 95% rename from src/main/java/forestry/plugins/PluginImmersiveEngineering.java rename to src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java index 76c8b8a43..bf03c0776 100644 --- a/src/main/java/forestry/plugins/PluginImmersiveEngineering.java +++ b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -22,6 +22,8 @@ import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; @Plugin(pluginID = "ImmersiveEngineering", name = "ImmersiveEngineering", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.immersiveengineering.description") public class PluginImmersiveEngineering extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginMagicalCrops.java b/src/main/java/forestry/plugins/compat/PluginMagicalCrops.java similarity index 98% rename from src/main/java/forestry/plugins/PluginMagicalCrops.java rename to src/main/java/forestry/plugins/compat/PluginMagicalCrops.java index e9935a47b..fe33e52e9 100644 --- a/src/main/java/forestry/plugins/PluginMagicalCrops.java +++ b/src/main/java/forestry/plugins/compat/PluginMagicalCrops.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableList; @@ -29,6 +29,8 @@ import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; @Plugin(pluginID = "MagicalCrops", name = "MagicalCrops", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.magicalcrops.description") public class PluginMagicalCrops extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/forestry/plugins/PluginNatura.java rename to src/main/java/forestry/plugins/compat/PluginNatura.java index bfc3494d2..79c1ffac9 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import java.util.ArrayList; import java.util.List; @@ -36,6 +36,9 @@ import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginCore; @Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description") public class PluginNatura extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginPlantMegaPack.java b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java similarity index 99% rename from src/main/java/forestry/plugins/PluginPlantMegaPack.java rename to src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java index 58ddcfb68..51b4cd816 100644 --- a/src/main/java/forestry/plugins/PluginPlantMegaPack.java +++ b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -31,6 +31,8 @@ import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; import forestry.farming.logic.FarmableStacked; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; @Plugin(pluginID = "PlantMegaPack", name = "PlantMegaPack", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.plantmegapack.description") public class PluginPlantMegaPack extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginWitchery.java b/src/main/java/forestry/plugins/compat/PluginWitchery.java similarity index 97% rename from src/main/java/forestry/plugins/PluginWitchery.java rename to src/main/java/forestry/plugins/compat/PluginWitchery.java index b0f0ea11e..0a815078e 100644 --- a/src/main/java/forestry/plugins/PluginWitchery.java +++ b/src/main/java/forestry/plugins/compat/PluginWitchery.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins; +package forestry.plugins.compat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -35,6 +35,8 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicFruit; import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; @Plugin(pluginID = "Witchery", name = "Witchery", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.witchery.description") public class PluginWitchery extends ForestryPlugin {