Split block type from properties, combine definition and properties

This commit is contained in:
mezz committed 2016-02-22 23:39:10 -08:00
1 parent 0672035596
commit ab0d1cf7fc
72 files changed
+1000 -1023

No files matched your search

@@ -65,9 +65,10 @@ import forestry.api.storage.StorageManager;
import forestry.apiculture.ArmorApiaristHelper;
import forestry.apiculture.SaveEventHandlerApiculture;
import forestry.apiculture.blocks.BlockAlveary;
import forestry.apiculture.blocks.BlockApicultureType;
import forestry.apiculture.blocks.BlockTypeApiculture;
import forestry.apiculture.blocks.BlockCandle;
import forestry.apiculture.blocks.BlockRegistryApiculture;
import forestry.apiculture.blocks.BlockTypeApicultureTesr;
import forestry.apiculture.commands.CommandBee;
import forestry.apiculture.entities.EntityMinecartApiary;
import forestry.apiculture.entities.EntityMinecartBeehouse;
@@ -94,7 +95,6 @@ import forestry.apiculture.multiblock.TileAlvearyStabiliser;
import forestry.apiculture.multiblock.TileAlvearySwarmer;
import forestry.apiculture.network.PacketRegistryApiculture;
import forestry.apiculture.proxy.ProxyApiculture;
import forestry.apiculture.tiles.TileApiaristChest;
import forestry.apiculture.tiles.TileCandle;
import forestry.apiculture.tiles.TileSwarm;
import forestry.apiculture.trigger.ApicultureTriggers;
@@ -103,7 +103,7 @@ import forestry.apiculture.worldgen.HiveDescription;
import forestry.apiculture.worldgen.HiveGenHelper;
import forestry.apiculture.worldgen.HiveRegistry;
import forestry.core.ISaveEventHandler;
import forestry.core.blocks.BlockCoreType;
import forestry.core.blocks.BlockTypeCoreTesr;
import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.config.LocalizedConfiguration;
@@ -111,9 +111,7 @@ import forestry.core.entities.EntityFXSnow;
import forestry.core.fluids.Fluids;
import forestry.core.items.EnumElectronTube;
import forestry.core.network.IPacketRegistry;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.EntityUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
@@ -181,15 +179,8 @@ public class PluginApiculture extends ForestryPlugin {
MinecraftForge.EVENT_BUS.register(this);
blocks.apiculture.addDefinitions(
new MachineDefinition(BlockApicultureType.APIARY).setFaces(0, 1, 2, 2, 4, 4, 0, 7),
new MachineDefinition(BlockApicultureType.APIARIST_CHEST_LEGACY).setLegacy(),
new MachineDefinition(BlockApicultureType.BEEHOUSE).setFaces(0, 1, 2, 2, 4, 4, 0, 7)
);
MachineDefinition definitionChest = new MachineDefinition(0, "forestry.ApiaristChestNew", TileApiaristChest.class, Proxies.render.getRenderChest("apiaristchest"))
.setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
blocks.apicultureChest.addDefinition(definitionChest);
blocks.apiculture.addDefinitions(BlockTypeApiculture.VALUES);
blocks.apicultureChest.addDefinitions(BlockTypeApicultureTesr.APIARIST_CHEST);
// Add triggers
if (PluginManager.Module.BUILDCRAFT_STATEMENTS.isEnabled()) {
@@ -465,12 +456,12 @@ public class PluginApiculture extends ForestryPlugin {
RecipeUtil.addRecipe(items.minecartBeehouse.getBeeHouseMinecart(),
"B",
"C",
'B', blocks.apiculture.get(BlockApicultureType.BEEHOUSE),
'B', blocks.apiculture.get(BlockTypeApiculture.BEE_HOUSE),
'C', Items.minecart);
RecipeUtil.addRecipe(items.minecartBeehouse.getApiaryMinecart(),
"B",
"C",
'B', blocks.apiculture.get(BlockApicultureType.APIARY),
'B', blocks.apiculture.get(BlockTypeApiculture.APIARY),
'C', Items.minecart);
// FOOD STUFF
@@ -712,7 +703,7 @@ public class PluginApiculture extends ForestryPlugin {
}
// ANALYZER
RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockCoreType.ANALYZER),
RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockTypeCoreTesr.ANALYZER),
"XTX",
" Y ",
"X X",
@@ -720,7 +711,7 @@ public class PluginApiculture extends ForestryPlugin {
'T', items.beealyzer,
'X', "ingotBronze");
RecipeUtil.addRecipe(blocks.apiculture.get(BlockApicultureType.APIARY),
RecipeUtil.addRecipe(blocks.apiculture.get(BlockTypeApiculture.APIARY),
"XXX",
"#C#",
"###",
@@ -736,7 +727,7 @@ public class PluginApiculture extends ForestryPlugin {
'X', "beeComb",
'Y', "chestWood");
RecipeUtil.addRecipe(blocks.apiculture.get(BlockApicultureType.BEEHOUSE),
RecipeUtil.addRecipe(blocks.apiculture.get(BlockTypeApiculture.BEE_HOUSE),
"XXX",
"#C#",
"###",
@@ -41,7 +41,7 @@ import forestry.api.storage.ICrateRegistry;
import forestry.api.storage.StorageManager;
import forestry.arboriculture.IWoodTyped;
import forestry.arboriculture.WoodItemAccess;
import forestry.arboriculture.blocks.BlockArboricultureType;
import forestry.arboriculture.blocks.BlockTypeArboricultureTesr;
import forestry.arboriculture.blocks.BlockFruitPod;
import forestry.arboriculture.blocks.BlockRegistryArboriculture;
import forestry.arboriculture.commands.CommandTree;
@@ -57,20 +57,17 @@ import forestry.arboriculture.items.ItemRegistryArboriculture;
import forestry.arboriculture.network.PacketRegistryArboriculture;
import forestry.arboriculture.proxy.ProxyArboriculture;
import forestry.arboriculture.render.TextureLeaves;
import forestry.arboriculture.tiles.TileArboristChest;
import forestry.arboriculture.tiles.TileFruitPod;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.arboriculture.tiles.TileSapling;
import forestry.arboriculture.tiles.TileWood;
import forestry.core.blocks.BlockCoreType;
import forestry.core.blocks.BlockTypeCoreTesr;
import forestry.core.config.Constants;
import forestry.core.fluids.Fluids;
import forestry.core.genetics.alleles.AllelePlantType;
import forestry.core.items.ItemFruit.EnumFruit;
import forestry.core.network.IPacketRegistry;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.ItemStackUtil;
import forestry.factory.recipes.FabricatorRecipe;
@@ -133,10 +130,7 @@ public class PluginArboriculture extends ForestryPlugin {
WoodItemAccess.registerStairs(blocks.stairsFireproof, woodType, true);
}
MachineDefinition definitionChest = new MachineDefinition(BlockArboricultureType.ARBCHEST.ordinal(),
"forestry.ArbChest", TileArboristChest.class, Proxies.render.getRenderChest("arbchest"))
.setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
blocks.arboriculture.addDefinition(definitionChest);
blocks.arboriculture.addDefinitions(BlockTypeArboricultureTesr.ARB_CHEST);
// Init rendering
proxy.initializeModels();
@@ -326,7 +320,7 @@ public class PluginArboriculture extends ForestryPlugin {
'#', "stickWood");
// ANALYZER
RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockCoreType.ANALYZER),
RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockTypeCoreTesr.ANALYZER),
"XTX",
" Y ",
"X X",
@@ -334,7 +328,7 @@ public class PluginArboriculture extends ForestryPlugin {
'T', items.treealyzer,
'X', "ingotBronze");
RecipeUtil.addRecipe(blocks.arboriculture.get(BlockArboricultureType.ARBCHEST),
RecipeUtil.addRecipe(blocks.arboriculture.get(BlockTypeArboricultureTesr.ARB_CHEST),
" # ",
"XYX",
"XXX",
@@ -34,7 +34,7 @@ import forestry.core.IPickupHandler;
import forestry.core.ISaveEventHandler;
import forestry.core.PickupHandlerCore;
import forestry.core.SaveEventHandlerCore;
import forestry.core.blocks.BlockCoreType;
import forestry.core.blocks.BlockTypeCoreTesr;
import forestry.core.blocks.BlockRegistryCore;
import forestry.core.blocks.BlockResourceOre;
import forestry.core.blocks.BlockResourceStorage;
@@ -57,7 +57,6 @@ import forestry.core.multiblock.MultiblockLogicFactory;
import forestry.core.network.IPacketRegistry;
import forestry.core.network.PacketRegistryCore;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.ClimateUtil;
import forestry.core.utils.ForestryModEnvWarningCallable;
@@ -101,10 +100,7 @@ public class PluginCore extends ForestryPlugin {
rootCommand.addChildCommand(new CommandVersion());
rootCommand.addChildCommand(new CommandPlugins());
blocks.core.addDefinitions(
new MachineDefinition(BlockCoreType.ESCRITOIRE),
new MachineDefinition(BlockCoreType.ANALYZER)
);
blocks.core.addDefinitions(BlockTypeCoreTesr.VALUES);
}
@Override
@@ -16,10 +16,9 @@ import net.minecraftforge.fml.common.SidedProxy;
import forestry.api.core.ForestryAPI;
import forestry.core.config.Constants;
import forestry.core.recipes.RecipeUtil;
import forestry.energy.blocks.BlockEngineType;
import forestry.energy.blocks.BlockTypeEngine;
import forestry.energy.blocks.BlockRegistryEnergy;
import forestry.energy.proxy.ProxyEnergy;
import forestry.energy.tiles.EngineDefinition;
@Plugin(pluginID = "Energy", name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.energy.description")
public class PluginEnergy extends ForestryPlugin {
@@ -37,12 +36,12 @@ public class PluginEnergy extends ForestryPlugin {
@Override
public void preInit() {
blocks.engine.addDefinitions(
new EngineDefinition(BlockEngineType.PEAT),
new EngineDefinition(BlockEngineType.BIOGAS)
BlockTypeEngine.PEAT,
BlockTypeEngine.BIOGAS
);
if (ForestryAPI.activeMode.getBooleanSetting("energy.engine.clockwork")) {
blocks.engine.addDefinition(new EngineDefinition(BlockEngineType.CLOCKWORK));
blocks.engine.addDefinitions(BlockTypeEngine.CLOCKWORK);
}
}
@@ -55,7 +54,7 @@ public class PluginEnergy extends ForestryPlugin {
protected void registerRecipes() {
super.registerRecipes();
RecipeUtil.addRecipe(blocks.engine.get(BlockEngineType.PEAT),
RecipeUtil.addRecipe(blocks.engine.get(BlockTypeEngine.PEAT),
"###",
" X ",
"YVY",
@@ -64,7 +63,7 @@ public class PluginEnergy extends ForestryPlugin {
'Y', "gearCopper",
'V', Blocks.piston);
RecipeUtil.addRecipe(blocks.engine.get(BlockEngineType.BIOGAS),
RecipeUtil.addRecipe(blocks.engine.get(BlockTypeEngine.BIOGAS),
"###",
" X ",
"YVY",
@@ -74,7 +73,7 @@ public class PluginEnergy extends ForestryPlugin {
'V', Blocks.piston);
if (ForestryAPI.activeMode.getBooleanSetting("energy.engine.clockwork")) {
RecipeUtil.addRecipe(blocks.engine.get(BlockEngineType.CLOCKWORK),
RecipeUtil.addRecipe(blocks.engine.get(BlockTypeEngine.CLOCKWORK),
"###",
" X ",
"ZVY",
@@ -32,7 +32,7 @@ import forestry.api.fuels.RainSubstrate;
import forestry.api.recipes.ICraftingProvider;
import forestry.api.recipes.RecipeManagers;
import forestry.apiculture.items.ItemRegistryApiculture;
import forestry.core.blocks.BlockCoreType;
import forestry.core.blocks.BlockTypeCoreTesr;
import forestry.core.blocks.BlockSoil;
import forestry.core.circuits.Circuit;
import forestry.core.circuits.CircuitLayout;
@@ -45,12 +45,11 @@ import forestry.core.items.ItemElectronTube;
import forestry.core.items.ItemRegistryCore;
import forestry.core.network.IPacketRegistry;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.datastructures.FluidMap;
import forestry.core.utils.datastructures.ItemStackMap;
import forestry.factory.DummyManagers;
import forestry.factory.blocks.BlockFactoryPlainType;
import forestry.factory.blocks.BlockFactoryTesrType;
import forestry.factory.blocks.BlockTypeFactoryPlain;
import forestry.factory.blocks.BlockTypeFactoryTesr;
import forestry.factory.blocks.BlockRegistryFactory;
import forestry.factory.circuits.CircuitSpeedUpgrade;
import forestry.factory.network.PacketRegistryFactory;
@@ -175,16 +174,8 @@ public class PluginFactory extends ForestryPlugin {
FuelManager.rainSubstrate.put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
MachineDefinition machineDefinition = new MachineDefinition(type);
blocks.factoryTESR.addDefinition(machineDefinition);
}
blocks.factoryPlain.addDefinitions(
new MachineDefinition(BlockFactoryPlainType.FABRICATOR).setFaces(0, 1, 2, 3, 4, 4),
new MachineDefinition(BlockFactoryPlainType.RAINTANK).setFaces(0, 1, 0, 0, 0, 0),
new MachineDefinition(BlockFactoryPlainType.WORKTABLE).setFaces(0, 1, 2, 3, 4, 4)
);
blocks.factoryTESR.addDefinitions(BlockTypeFactoryTesr.VALUES);
blocks.factoryPlain.addDefinitions(BlockTypeFactoryPlain.VALUES);
ICircuitLayout layoutMachineUpgrade = new CircuitLayout("machine.upgrade", CircuitSocketType.MACHINE);
ChipsetManager.circuitRegistry.registerLayout(layoutMachineUpgrade);
@@ -319,7 +310,7 @@ public class PluginFactory extends ForestryPlugin {
"###",
'#', "logWood");
RecipeManagers.carpenterManager.addRecipe(50, Fluids.SEEDOIL.getFluid(500), null,
PluginCore.blocks.core.get(BlockCoreType.ESCRITOIRE),
PluginCore.blocks.core.get(BlockTypeCoreTesr.ESCRITOIRE),
"# ",
"###",
"# #",
@@ -433,7 +424,7 @@ public class PluginFactory extends ForestryPlugin {
ChipsetManager.solderManager.addRecipe(layout, PluginCore.items.tubes.get(EnumElectronTube.BLAZE, 1), Circuit.machineSpeedUpgrade2);
ChipsetManager.solderManager.addRecipe(layout, PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1), Circuit.machineEfficiencyUpgrade1);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.BOTTLER),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.BOTTLER),
"X#X",
"#Y#",
"X#X",
@@ -441,7 +432,7 @@ public class PluginFactory extends ForestryPlugin {
'X', PluginFluids.items.canEmpty,
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.CARPENTER),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.CARPENTER),
"X#X",
"XYX",
"X#X",
@@ -449,7 +440,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "ingotBronze",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.CENTRIFUGE),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.CENTRIFUGE),
"X#X",
"XYX",
"X#X",
@@ -457,7 +448,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "ingotCopper",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.FERMENTER),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.FERMENTER),
"X#X",
"#Y#",
"X#X",
@@ -465,7 +456,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "gearBronze",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.MOISTENER),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.MOISTENER),
"X#X",
"#Y#",
"X#X",
@@ -473,7 +464,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "gearCopper",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.SQUEEZER),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.SQUEEZER),
"X#X",
"XYX",
"X#X",
@@ -481,7 +472,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "ingotTin",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.STILL),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.STILL),
"X#X",
"#Y#",
"X#X",
@@ -489,7 +480,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "dustRedstone",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockFactoryTesrType.RAINMAKER),
RecipeUtil.addRecipe(blocks.factoryTESR.get(BlockTypeFactoryTesr.RAINMAKER),
"X#X",
"#Y#",
"X#X",
@@ -497,7 +488,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "gearTin",
'Y', PluginCore.items.hardenedCasing);
RecipeUtil.addRecipe(blocks.factoryPlain.get(BlockFactoryPlainType.FABRICATOR),
RecipeUtil.addRecipe(blocks.factoryPlain.get(BlockTypeFactoryPlain.FABRICATOR),
"X#X",
"#Y#",
"XZX",
@@ -506,7 +497,7 @@ public class PluginFactory extends ForestryPlugin {
'Y', PluginCore.items.sturdyCasing,
'Z', "chestWood");
RecipeUtil.addRecipe(blocks.factoryPlain.get(BlockFactoryPlainType.RAINTANK),
RecipeUtil.addRecipe(blocks.factoryPlain.get(BlockTypeFactoryPlain.RAINTANK),
"X#X",
"XYX",
"X#X",
@@ -514,7 +505,7 @@ public class PluginFactory extends ForestryPlugin {
'X', "ingotIron",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.factoryPlain.get(BlockFactoryPlainType.WORKTABLE),
RecipeUtil.addRecipe(blocks.factoryPlain.get(BlockTypeFactoryPlain.WORKTABLE),
"B",
"W",
"C",
@@ -15,6 +15,7 @@ import java.util.EnumSet;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.SidedProxy;
@@ -33,11 +34,10 @@ import forestry.core.config.Constants;
import forestry.core.config.LocalizedConfiguration;
import forestry.core.fluids.Fluids;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.EntityUtil;
import forestry.lepidopterology.ButterflySpawner;
import forestry.lepidopterology.blocks.BlockLepidopterologyType;
import forestry.lepidopterology.blocks.BlockRegistryLepidopterology;
import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr;
import forestry.lepidopterology.commands.CommandButterfly;
import forestry.lepidopterology.entities.EntityButterfly;
import forestry.lepidopterology.genetics.AlleleButterflyEffect;
@@ -87,9 +87,7 @@ public class PluginLepidopterology extends ForestryPlugin {
ButterflyBranchDefinition.createAlleles();
AlleleButterflyEffect.createAlleles();
MachineDefinition definitionChest = new MachineDefinition(BlockLepidopterologyType.LEPICHEST)
.setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
blocks.lepidopterology.addDefinition(definitionChest);
blocks.lepidopterology.addDefinitions(BlockTypeLepidopterologyTesr.VALUES);
}
@Override
@@ -138,7 +136,7 @@ public class PluginLepidopterology extends ForestryPlugin {
"X#X", "X#X", "RDR", '#', "paneGlass", 'X', "ingotBronze", 'R',
"dustRedstone", 'D', "gemDiamond");
RecipeUtil.addRecipe(blocks.lepidopterology.get(BlockLepidopterologyType.LEPICHEST),
RecipeUtil.addRecipe(blocks.lepidopterology.get(BlockTypeLepidopterologyTesr.LEPICHEST),
" # ",
"XYX",
"XXX",
@@ -25,12 +25,11 @@ import forestry.core.fluids.Fluids;
import forestry.core.items.EnumElectronTube;
import forestry.core.network.IPacketRegistry;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.mail.EventHandlerMailAlert;
import forestry.mail.PostRegistry;
import forestry.mail.PostalCarrier;
import forestry.mail.SaveEventHandlerMail;
import forestry.mail.blocks.BlockMailType;
import forestry.mail.blocks.BlockTypeMail;
import forestry.mail.blocks.BlockRegistryMail;
import forestry.mail.commands.CommandMail;
import forestry.mail.items.EnumStampDefinition;
@@ -68,11 +67,7 @@ public class PluginMail extends ForestryPlugin {
FMLCommonHandler.instance().bus().register(new EventHandlerMailAlert());
}
blocks.mail.addDefinitions(
new MachineDefinition(BlockMailType.MAILBOX).setFaces(0, 1, 2, 2, 2, 2, 0, 7),
new MachineDefinition(BlockMailType.TRADESTATION).setFaces(0, 1, 2, 3, 4, 4, 0, 7),
new MachineDefinition(BlockMailType.PHILATELIST).setFaces(0, 1, 2, 3, 2, 2, 0, 7)
);
blocks.mail.addDefinitions(BlockTypeMail.VALUES);
}
@Override
@@ -139,7 +134,7 @@ public class PluginMail extends ForestryPlugin {
RecipeUtil.addShapelessRecipe(items.catalogue.getItemStack(), items.stamps.getWildcard(), new ItemStack(Items.book));
RecipeUtil.addRecipe(blocks.mail.get(BlockMailType.MAILBOX),
RecipeUtil.addRecipe(blocks.mail.get(BlockTypeMail.MAILBOX),
" # ",
"#Y#",
"XXX",
@@ -147,7 +142,7 @@ public class PluginMail extends ForestryPlugin {
'X', "chestWood",
'Y', PluginCore.items.sturdyCasing);
RecipeUtil.addRecipe(blocks.mail.get(BlockMailType.TRADESTATION),
RecipeUtil.addRecipe(blocks.mail.get(BlockTypeMail.TRADE_STATION),
"Z#Z",
"#Y#",
"XWX",
@@ -64,7 +64,7 @@ import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.core.utils.StringUtil;
import forestry.lepidopterology.blocks.BlockLepidopterologyType;
import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr;
import forestry.lepidopterology.blocks.BlockRegistryLepidopterology;
import forestry.storage.BackpackDefinition;
import forestry.storage.BackpackDefinition.BackpackDefinitionApiarist;
@@ -509,7 +509,7 @@ public class PluginStorage extends ForestryPlugin {
BlockRegistryLepidopterology butterflyBlocks = PluginLepidopterology.blocks;
if (items.lepidopteristBackpack != null && butterflyBlocks != null) {
ItemStack chest = butterflyBlocks.lepidopterology.get(BlockLepidopterologyType.LEPICHEST);
ItemStack chest = butterflyBlocks.lepidopterology.get(BlockTypeLepidopterologyTesr.LEPICHEST);
addBackpackRecipe(items.lepidopteristBackpack, "stickWood", chest);
}