Code cleanup and remove some unused code

This commit is contained in:
mezz committed 2015-08-02 22:53:19 -07:00
1 parent f0f8c9a984
commit fdf3493ed0
295 files changed
+899 -2840

No files matched your search

@@ -157,19 +157,18 @@ public class PluginApiculture extends ForestryPlugin {
@SidedProxy(clientSide = "forestry.apiculture.proxy.ClientProxyApiculture", serverSide = "forestry.apiculture.proxy.ProxyApiculture")
public static ProxyApiculture proxy;
private static final String CONFIG_CATEGORY = "apiculture";
public static final String[] EMPTY_STRINGS = new String[0];
private static final String[] EMPTY_STRINGS = new String[0];
public static String beekeepingMode = "NORMAL";
private static float secondPrincessChance = 0;
public static final int ticksPerBeeWorkCycle = 550;
public static boolean apiarySideSensitive = false;
public static boolean fancyRenderedBees = false;
public static HiveRegistry hiveRegistry;
public static MachineDefinition definitionApiary;
public static MachineDefinition definitionChest;
public static MachineDefinition definitionBeehouse;
public static MachineDefinition definitionAnalyzer;
private static MachineDefinition definitionApiary;
private static MachineDefinition definitionChest;
private static MachineDefinition definitionBeehouse;
private static MachineDefinition definitionAnalyzer;
private final Map<String, String[]> defaultAcceptedFlowers = new HashMap<String, String[]>();
private final Map<String, String[]> defaultPlantableFlowers = new HashMap<String, String[]>();
@@ -455,11 +454,7 @@ public class PluginApiculture extends ForestryPlugin {
// Config
forestry.core.config.deprecated.Configuration apicultureConfig = new forestry.core.config.deprecated.Configuration();
forestry.core.config.deprecated.Property property = apicultureConfig.get("apiary.sidesensitive", CONFIG_CATEGORY, apiarySideSensitive);
property.comment = "set to false if apiaries should output all items regardless of side a pipe is attached to";
apiarySideSensitive = Boolean.parseBoolean(property.value);
property = apicultureConfig.get("render.bees.fancy", CONFIG_CATEGORY, fancyRenderedBees);
forestry.core.config.deprecated.Property property = apicultureConfig.get("render.bees.fancy", CONFIG_CATEGORY, fancyRenderedBees);
property.comment = "set to true to enable a fancy butterfly-like renderer for bees. (experimental!)";
fancyRenderedBees = Boolean.parseBoolean(property.value);
@@ -866,7 +861,7 @@ public class PluginApiculture extends ForestryPlugin {
definitionChest.register();
}
public static IRecipe[] createAlyzerRecipes(Block block, int meta) {
private static IRecipe[] createAlyzerRecipes(Block block, int meta) {
ArrayList<IRecipe> recipes = new ArrayList<IRecipe>();
recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta), "XTX", " Y ", "X X", 'Y', ForestryItem.sturdyCasing, 'T', ForestryItem.beealyzer, 'X', "ingotBronze"));
recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta), "XTX", " Y ", "X X", 'Y', ForestryItem.sturdyCasing, 'T', ForestryItem.treealyzer, 'X', "ingotBronze"));
@@ -1050,14 +1045,14 @@ public class PluginApiculture extends ForestryPlugin {
@Override
public void populateChunk(IChunkProvider chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) {
if (Config.getBeehivesAmount() > 0.0) {
HiveDecorator.instance().decorateHives(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated);
HiveDecorator.decorateHives(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated);
}
}
@Override
public void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ) {
if (Config.getBeehivesAmount() > 0.0) {
HiveDecorator.instance().decorateHives(world, rand, chunkX, chunkZ);
HiveDecorator.decorateHives(world, rand, chunkX, chunkZ);
}
}
@@ -109,7 +109,7 @@ public class PluginArboriculture extends ForestryPlugin {
public static int modelIdFences;
public static int modelIdPods;
public static MachineDefinition definitionChest;
private static MachineDefinition definitionChest;
public static final List<Block> validFences = new ArrayList<Block>();
@Override
@@ -148,14 +148,14 @@ public class PluginArboriculture extends ForestryPlugin {
ForestryBlock.fences.registerBlock(new BlockArbFence(false), ItemWoodBlock.class, "fences");
OreDictionary.registerOre("fenceWood", ForestryBlock.fences.getWildcard());
ForestryBlock.stairs.registerBlock(new BlockArbStairs(ForestryBlock.planks.block(), 0, false), ItemWoodBlock.class, "stairs");
ForestryBlock.stairs.registerBlock(new BlockArbStairs(ForestryBlock.planks.block(), false), ItemWoodBlock.class, "stairs");
OreDictionary.registerOre("stairWood", ForestryBlock.stairs.getWildcard());
ForestryBlock.logsFireproof.registerBlock(new BlockLog(true), ItemWoodBlock.class, "logsFireproof");
ForestryBlock.planksFireproof.registerBlock(new BlockPlanks(true), ItemWoodBlock.class, "planksFireproof");
ForestryBlock.slabsFireproof.registerBlock(new BlockSlab(true), ItemWoodBlock.class, "slabsFireproof");
ForestryBlock.fencesFireproof.registerBlock(new BlockArbFence(true), ItemWoodBlock.class, "fencesFireproof");
ForestryBlock.stairsFireproof.registerBlock(new BlockArbStairs(ForestryBlock.planksFireproof.block(), 0, true), ItemWoodBlock.class, "stairsFireproof");
ForestryBlock.stairsFireproof.registerBlock(new BlockArbStairs(ForestryBlock.planksFireproof.block(), true), ItemWoodBlock.class, "stairsFireproof");
for (WoodType woodType : WoodType.VALUES) {
woodType.registerLog(ForestryBlock.logs.block(), false);
@@ -33,11 +33,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
private static final String BoP = "BiomesOPlenty";
public static Block BoPSaplings;
public static Block BoPColorizedSaplings;
public static Block BoPTurnip;
public static Item BoPTurnipSeeds;
@Override
public boolean isAvailable() {
return Proxies.common.isModLoaded(BoP);
@@ -52,17 +47,17 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
public void doInit() {
super.doInit();
BoPSaplings = GameRegistry.findBlock(BoP, "saplings");
BoPColorizedSaplings = GameRegistry.findBlock(BoP, "colorizedSaplings");
BoPTurnipSeeds = GameRegistry.findItem(BoP, "turnipSeeds");
BoPTurnip = GameRegistry.findBlock(BoP, "turnip");
Block boPSaplings = GameRegistry.findBlock(BoP, "saplings");
Block boPColorizedSaplings = GameRegistry.findBlock(BoP, "colorizedSaplings");
Item boPTurnipSeeds = GameRegistry.findItem(BoP, "turnipSeeds");
Block boPTurnip = GameRegistry.findBlock(BoP, "turnip");
List<String> saplingItemKeys = new ArrayList<String>();
if (BoPSaplings != null) {
if (boPSaplings != null) {
saplingItemKeys.add("saplings");
}
if (BoPColorizedSaplings != null) {
if (boPColorizedSaplings != null) {
saplingItemKeys.add("colorizedSaplings");
}
@@ -72,9 +67,9 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName));
}
ItemStack BoPPersimmon = new ItemStack(GameRegistry.findItem(BoP, "food"), 1, 8);
Farmables.farmables.get("farmArboreal").add(new FarmableGenericSapling(BoPSaplings, 15, BoPPersimmon));
Farmables.farmables.get("farmArboreal").add(new FarmableGenericSapling(boPSaplings, 15, BoPPersimmon));
Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(BoPTurnipSeeds, 1, 0), BoPTurnip, 7));
Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(BoPTurnip, 7));
Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(boPTurnipSeeds, 1, 0), boPTurnip, 7));
Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(boPTurnip, 7));
}
}
@@ -80,9 +80,8 @@ import forestry.core.utils.ShapedRecipeCustom;
@Plugin(pluginID = "Core", name = "Core", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.core.description")
public class PluginCore extends ForestryPlugin {
public static MachineDefinition definitionEscritoire;
// ICrashCallable for highlighting certain mods during crashes.
public static ForestryModEnvWarningCallable crashCallable;
private static MachineDefinition definitionEscritoire;
public static final RootCommand rootCommand = new RootCommand();
private AlleleHelper alleleHelper;
@@ -143,7 +142,7 @@ public class PluginCore extends ForestryPlugin {
super.doInit();
definitionEscritoire.register();
crashCallable = new ForestryModEnvWarningCallable();
ForestryModEnvWarningCallable.register();
alleleHelper.init();
@@ -169,7 +168,7 @@ public class PluginCore extends ForestryPlugin {
protected void registerItems() {
// / FERTILIZERS
ForestryItem.fertilizerBio.registerItem((new ItemForestry()), "fertilizerBio");
ForestryItem.fertilizerCompound.registerItem((new ItemForestry()).setBonemeal(true), "fertilizerCompound");
ForestryItem.fertilizerCompound.registerItem((new ItemForestry()).setBonemeal(), "fertilizerCompound");
// / GEMS
ForestryItem.apatite.registerItem((new ItemForestry()), "apatite");
@@ -198,7 +197,7 @@ public class PluginCore extends ForestryPlugin {
ForestryItem.craftingMaterial.registerItem(new ItemMisc(), "craftingMaterial");
/* ARMOR */
ForestryItem.naturalistHat.registerItem(new ItemArmorNaturalist(0), "naturalistHelmet");
ForestryItem.naturalistHat.registerItem(new ItemArmorNaturalist(), "naturalistHelmet");
// / PEAT PRODUCTION
ForestryItem.peat.registerItem((new ItemForestry()), "peat");
@@ -36,9 +36,9 @@ public class PluginEnergy extends ForestryPlugin {
@SidedProxy(clientSide = "forestry.energy.proxy.ClientProxyEnergy", serverSide = "forestry.energy.proxy.ProxyEnergy")
public static ProxyEnergy proxy;
public static MachineDefinition definitionEngineCopper;
public static MachineDefinition definitionEngineBronze;
public static MachineDefinition definitionEngineClockwork;
private static MachineDefinition definitionEngineCopper;
private static MachineDefinition definitionEngineBronze;
private static MachineDefinition definitionEngineClockwork;
@Override
public void preInit() {
@@ -35,8 +35,6 @@ public class PluginExtraUtilities extends ForestryPlugin {
private static final String ExU = "ExtraUtilities";
public static Block ExUEnderLilly;
@Override
public boolean isAvailable() {
return Proxies.common.isModLoaded(ExU);
@@ -51,11 +49,11 @@ public class PluginExtraUtilities extends ForestryPlugin {
public void doInit() {
super.doInit();
ExUEnderLilly = GameRegistry.findBlock(ExU, "plant/ender_lilly");
Block exUEnderLilly = GameRegistry.findBlock(ExU, "plant/ender_lilly");
Farmables.farmables.put("farmEnder", new ArrayList<IFarmable>());
if (Config.isExUtilEnderLilyEnabled()) {
Circuit.farmEnderManaged = new CircuitFarmLogic("managedEnder", FarmLogicEnder.class);
Farmables.farmables.get("farmEnder").add(new FarmableGenericCrop(new ItemStack(ExUEnderLilly, 1, 0), ExUEnderLilly, 7));
Farmables.farmables.get("farmEnder").add(new FarmableGenericCrop(new ItemStack(exUEnderLilly, 1, 0), exUEnderLilly, 7));
}
}
@@ -29,7 +29,6 @@ import forestry.core.config.ForestryItem;
import forestry.core.fluids.Fluids;
import forestry.core.gadgets.BlockBase;
import forestry.core.gadgets.MachineDefinition;
import forestry.core.gadgets.MachineNBTDefinition;
import forestry.core.items.ItemForestryBlock;
import forestry.core.items.ItemNBTTile;
import forestry.core.network.IPacketHandler;
@@ -57,17 +56,17 @@ import forestry.factory.triggers.FactoryTriggers;
@Plugin(pluginID = "Factory", name = "Factory", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.factory.description")
public class PluginFactory extends ForestryPlugin {
public static MachineDefinition definitionBottler;
public static MachineDefinition definitionCarpenter;
public static MachineDefinition definitionCentrifuge;
public static MachineDefinition definitionFermenter;
public static MachineDefinition definitionMoistener;
public static MachineDefinition definitionSqueezer;
public static MachineDefinition definitionStill;
public static MachineDefinition definitionRainmaker;
public static MachineDefinition definitionFabricator;
public static MachineDefinition definitionRaintank;
public static MachineDefinition definitionWorktable;
private static MachineDefinition definitionBottler;
private static MachineDefinition definitionCarpenter;
private static MachineDefinition definitionCentrifuge;
private static MachineDefinition definitionFermenter;
private static MachineDefinition definitionMoistener;
private static MachineDefinition definitionSqueezer;
private static MachineDefinition definitionStill;
private static MachineDefinition definitionRainmaker;
private static MachineDefinition definitionFabricator;
private static MachineDefinition definitionRaintank;
private static MachineDefinition definitionWorktable;
@Override
protected void setupAPI() {
@@ -196,7 +195,7 @@ public class PluginFactory extends ForestryPlugin {
BlockBase factoryPlain = ((BlockBase) ForestryBlock.factoryPlain.block());
definitionFabricator = factoryPlain.addDefinition(new MachineNBTDefinition(Defaults.DEFINITION_FABRICATOR_META, "forestry.Fabricator", MachineFabricator.class,
definitionFabricator = factoryPlain.addDefinition(new MachineDefinition(Defaults.DEFINITION_FABRICATOR_META, "forestry.Fabricator", MachineFabricator.class,
ShapedRecipeCustom.createShapedRecipe(
ForestryBlock.factoryPlain.getItemStack(1, Defaults.DEFINITION_FABRICATOR_META),
"X#X",
@@ -218,7 +217,7 @@ public class PluginFactory extends ForestryPlugin {
'Y', ForestryItem.sturdyCasing))
.setFaces(0, 1, 0, 0, 0, 0));
definitionWorktable = factoryPlain.addDefinition(new MachineNBTDefinition(Defaults.DEFINITION_WORKTABLE_META, "forestry.Worktable", TileWorktable.class,
definitionWorktable = factoryPlain.addDefinition(new MachineDefinition(Defaults.DEFINITION_WORKTABLE_META, "forestry.Worktable", TileWorktable.class,
ShapedRecipeCustom.createShapedRecipe(ForestryBlock.factoryPlain.getItemStack(1, Defaults.DEFINITION_WORKTABLE_META),
"B",
"W",
@@ -10,13 +10,14 @@
******************************************************************************/
package forestry.plugins;
import java.util.Collections;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.network.IGuiHandler;
import forestry.api.food.BeverageManager;
import forestry.api.food.IBeverageEffect;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryItem;
import forestry.core.fluids.Fluids;
@@ -65,7 +66,7 @@ public class PluginFood extends ForestryPlugin {
// Mead
ItemStack meadBottle = ForestryItem.beverage.getItemStack();
((ItemBeverage) ForestryItem.beverage.item()).beverages[0].saveEffects(meadBottle, new IBeverageEffect[]{BeverageEffect.weakAlcoholic});
BeverageInfo.saveEffects(meadBottle, Collections.singletonList(BeverageEffect.weakAlcoholic));
LiquidHelper.injectLiquidContainer(Fluids.SHORT_MEAD, Defaults.BUCKET_VOLUME, meadBottle, new ItemStack(Items.glass_bottle));
}
+17 -16
View File
@@ -68,26 +68,27 @@ public class PluginIC2 extends ForestryPlugin {
public static PluginIC2 instance;
// Forestry stuff
public static MachineDefinition definitionGenerator;
public static MachineDefinition definitionEngineTin;
private static MachineDefinition definitionGenerator;
private static MachineDefinition definitionEngineTin;
// IC2 stuff
public static ItemStack plantBall;
public static ItemStack compressedPlantBall;
public static ItemStack wrench;
public static ItemStack treetap;
private static ItemStack plantBall;
private static ItemStack compressedPlantBall;
private static ItemStack wrench;
private static ItemStack treetap;
private static ItemStack rubbersapling;
private static ItemStack rubberleaves;
private static ItemStack emptyCell;
private static ItemStack lavaCell;
private static ItemStack waterCell;
private static ItemStack rubber;
private static ItemStack scrap;
private static ItemStack silver;
private static ItemStack brass;
private static ItemStack uuMatter;
public static ItemStack resin;
public static ItemStack rubbersapling;
public static ItemStack rubberwood;
public static ItemStack rubberleaves;
public static ItemStack emptyCell;
public static ItemStack lavaCell;
public static ItemStack waterCell;
public static ItemStack rubber;
public static ItemStack scrap;
public static ItemStack silver;
public static ItemStack brass;
public static ItemStack uuMatter;
public PluginIC2() {
if (PluginIC2.instance == null) {
@@ -71,18 +71,10 @@ public class PluginLepidopterology extends ForestryPlugin {
public static int spawnConstraint = 100;
public static int entityConstraint = 1000;
private static boolean allowPollination = true;
public static IClassification geometridae;
public static IClassification saturniidae;
public static IClassification pieridae;
public static IClassification nymphalidae;
public static IClassification lycaenidae;
public static IClassification papilionidae;
public static IClassification notchidae;
/**
* See {@link IButterflyRoot} for details.
*/
public static IButterflyRoot butterflyInterface;
public static MachineDefinition definitionChest;
@Override
protected void setupAPI() {
@@ -133,7 +125,7 @@ public class PluginLepidopterology extends ForestryPlugin {
registerTemplates();
BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block());
definitionChest = lepidopterology.addDefinition((new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class,
MachineDefinition definitionChest = lepidopterology.addDefinition((new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class,
ShapedRecipeCustom.createShapedRecipe(
ForestryBlock.lepidopterology.getItemStack(1, Defaults.DEFINITION_LEPICHEST_META),
" # ",
@@ -199,33 +191,33 @@ public class PluginLepidopterology extends ForestryPlugin {
IClassification lepidoptera = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.ORDER, "lepidoptera", "Lepidoptera");
AlleleManager.alleleRegistry.getClassification("class.insecta").addMemberGroup(lepidoptera);
geometridae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "geometridae", "Geometridae");
IClassification geometridae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "geometridae", "Geometridae");
lepidoptera.addMemberGroup(geometridae);
saturniidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "saturniidae", "Saturniidae");
IClassification saturniidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "saturniidae", "Saturniidae");
lepidoptera.addMemberGroup(saturniidae);
pieridae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "pieridae", "Pieridae");
IClassification pieridae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "pieridae", "Pieridae");
lepidoptera.addMemberGroup(pieridae);
nymphalidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "nymphalidae", "Nymphalidae");
IClassification nymphalidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "nymphalidae", "Nymphalidae");
lepidoptera.addMemberGroup(nymphalidae);
lycaenidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "lycaenidae", "Lycaenidae");
IClassification lycaenidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "lycaenidae", "Lycaenidae");
lepidoptera.addMemberGroup(lycaenidae);
papilionidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "papilionidae", "Papilionidae");
IClassification papilionidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "papilionidae", "Papilionidae");
lepidoptera.addMemberGroup(papilionidae);
notchidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "notchidae", "Notchidae");
IClassification notchidae = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.FAMILY, "notchidae", "Notchidae");
lepidoptera.addMemberGroup(notchidae);
/* GEOMETRIDAE */
IClassification opisthograptis = createButterflyBranch(geometridae, "Opisthograptis");
IClassification chiasmia = createButterflyBranch(geometridae, "Chiasmia");
Allele.mothBrimstone = new AlleleButterflySpecies("mothBrimstone", true, "brimstone", opisthograptis, "luteolata", 0xffea40).setNocturnal(true).setRarity(1.0f);
Allele.mothLatticedHeath = new AlleleButterflySpecies("mothLatticedHeath", true, "latticedHeath", chiasmia, "clathrata", 0xf2f0be).setNocturnal(true).setRarity(0.5f);
Allele.mothBrimstone = new AlleleButterflySpecies("mothBrimstone", true, "brimstone", opisthograptis, "luteolata", 0xffea40).setNocturnal().setRarity(1.0f);
Allele.mothLatticedHeath = new AlleleButterflySpecies("mothLatticedHeath", true, "latticedHeath", chiasmia, "clathrata", 0xf2f0be).setNocturnal().setRarity(0.5f);
/* SATURNIIDAE */
IClassification attacus = createButterflyBranch(saturniidae, "Attacus");
Allele.mothAtlas = new AlleleButterflySpecies("mothAtlas", false, "atlas", attacus, "atlas", 0xd96e3d).setNocturnal(true);
Allele.mothAtlas = new AlleleButterflySpecies("mothAtlas", false, "atlas", attacus, "atlas", 0xd96e3d).setNocturnal();
/* PIERIDAE */
IClassification pieris = createButterflyBranch(pieridae, "Pieris");
@@ -171,7 +171,7 @@ public class PluginMagicalCrops extends ForestryPlugin {
}
}
private void addRecipes(String seedPrefix, String cropPrefix, String name, int fluidAmount) {
private static void addRecipes(String seedPrefix, String cropPrefix, String name, int fluidAmount) {
ItemStack seed = GameRegistry.findItemStack(MagCrop, MagCrop + seedPrefix + name, 1);
Block crop = GameRegistry.findBlock(MagCrop, MagCrop + cropPrefix + name);
if (seed != null) {
@@ -53,10 +53,10 @@ import forestry.mail.triggers.MailTriggers;
@Plugin(pluginID = "Mail", name = "Mail", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.mail.description")
public class PluginMail extends ForestryPlugin {
public static MachineDefinition definitionMailbox;
public static MachineDefinition definitionTradestation;
public static MachineDefinition definitionPhilatelist;
public static StampInfo[] stampDefinitions;
private static MachineDefinition definitionMailbox;
private static MachineDefinition definitionTradestation;
private static MachineDefinition definitionPhilatelist;
private static StampInfo[] stampDefinitions;
@Override
protected void setupAPI() {
@@ -47,8 +47,8 @@ import forestry.core.proxy.Proxies;
public class PluginManager {
public static final String MODULE_CONFIG_FILE_NAME = "modules.cfg";
public static final String CATEGORY_MODULES = "modules";
private static final String MODULE_CONFIG_FILE_NAME = "modules.cfg";
private static final String CATEGORY_MODULES = "modules";
public static final ArrayList<IGuiHandler> guiHandlers = Lists.newArrayList();
public static final ArrayList<IPacketHandler> packetHandlers = Lists.newArrayList();
@@ -41,21 +41,21 @@ public class PluginNatura extends ForestryPlugin {
private static final String NATURA = "Natura";
public static Block logNatura;
public static Block logWillow;
private static Block logNatura;
private static Block logWillow;
public static Block leavesNatura;
public static Block saplingNatura;
public static Block saplingNaturaRare;
public static ItemStack berryBlight;
public static ItemStack berryDusk;
public static ItemStack berrySky;
public static ItemStack berrySting;
public static ItemStack berryRasp;
public static ItemStack berryBlue;
public static ItemStack berryBlack;
public static ItemStack berryMalo;
public static ItemStack itemBarley;
private static Block leavesNatura;
private static Block saplingNatura;
private static Block saplingNaturaRare;
private static ItemStack berryBlight;
private static ItemStack berryDusk;
private static ItemStack berrySky;
private static ItemStack berrySting;
private static ItemStack berryRasp;
private static ItemStack berryBlue;
private static ItemStack berryBlack;
private static ItemStack berryMalo;
private static ItemStack itemBarley;
@Override
public boolean isAvailable() {
@@ -63,7 +63,7 @@ public class PluginPropolisPipe extends ForestryPlugin {
}
proxy.initPropolisPipe();
proxy.registerCraftingPropolis(ForestryItem.propolis.getItemStack());
ProxyPipes.registerCraftingPropolis(ForestryItem.propolis.getItemStack());
}
@Override
@@ -117,12 +117,12 @@ public class PluginStorage extends ForestryPlugin {
BackpackDefinition definition;
if (PluginManager.Module.APICULTURE.isEnabled()) {
definition = new BackpackDefinitionApiarist("apiarist", new Color(0xc4923d).getRGB());
definition = new BackpackDefinitionApiarist(new Color(0xc4923d).getRGB());
BackpackManager.definitions.put(definition.getKey(), definition);
}
if (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) {
definition = new BackpackDefinitionLepidopterist("lepidopterist", new Color(0x995b31).getRGB());
definition = new BackpackDefinitionLepidopterist(new Color(0x995b31).getRGB());
BackpackManager.definitions.put(definition.getKey(), definition);
}