diff --git a/lang b/lang index 3c34adcc5..78a42965d 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 3c34adcc54f2e1dc0d06b6720261fcd77c4e2f24 +Subproject commit 78a42965de89d39804cccdaeed51ac2cf98f2919 diff --git a/src/main/java/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java index 6d586e14e..eb8838dae 100755 --- a/src/main/java/forestry/core/config/ForestryItem.java +++ b/src/main/java/forestry/core/config/ForestryItem.java @@ -43,8 +43,6 @@ public enum ForestryItem { wrench, pipette, bucketBiomass, - vialEmpty, - vialCatalyst, bucketBiofuel, // Crafting impregnatedCasing, diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index b3a009d30..3b66f571c 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -472,36 +472,6 @@ public class PluginApiculture extends ForestryPlugin { // / HABITAT LOCATOR //Proxies.common.addRecipe(ForestryItem.biomeFinder.getItemStack(), // new Object[] { " X ", "X#X", " X ", '#', Items.redstone, 'X', "ingotBronze" }); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), - "###", "YXY", - '#', ForestryItem.waxCapsule, - 'X', Items.bone, - 'Y', ForestryItem.pollenCluster); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), - "###", "YXY", - '#', ForestryItem.canEmpty, - 'X', Items.bone, - 'Y', ForestryItem.pollenCluster); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.fertilizerCompound, - 'X', ForestryItem.waxCapsule); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.fertilizerCompound, - 'X', ForestryItem.canEmpty); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.pollenCluster, - 'X', ForestryItem.waxCapsule); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.pollenCluster, - 'X', ForestryItem.canEmpty); // Bees Proxies.common.addRecipe(ForestryItem.scoop.getItemStack(1), diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 411514819..f904f8b00 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -193,13 +193,6 @@ public class PluginCore extends ForestryPlugin { /* ARMOR */ ForestryItem.naturalistHat.registerItem(new ItemArmorNaturalist(0), "naturalistHelmet"); - // / DISCONTINUED - // ForestryItem.vialEmpty = (new - // ItemForestry(Config.getOrCreateIntProperty("vialEmpty", - // Config.CATEGORY_ITEM, Defaults.ID_ITEM_VIAL_EMPTY))) - // .setItemName("vialEmpty").setIconIndex(10); - ForestryItem.vialCatalyst.registerItem((new ItemForestry()), "vialCatalyst"); - // / PEAT PRODUCTION ForestryItem.peat.registerItem((new ItemForestry()), "peat"); OreDictionary.registerOre("brickPeat", ForestryItem.peat.getItemStack()); @@ -432,10 +425,6 @@ public class PluginCore extends ForestryPlugin { Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.refractoryWater, 'Y', Blocks.sand); } - // Vials and catalyst - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), "###", "YXY", '#', ForestryItem.waxCapsule.item(), 'X', Items.bone, 'Y', ForestryItem.fertilizerCompound); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), "###", "YXY", '#', ForestryItem.canEmpty.item(), 'X', Items.bone, 'Y', ForestryItem.fertilizerCompound); - // Crafting Material Proxies.common.addRecipe(new ItemStack(Items.string), "#", "#", "#", '#', ForestryItem.craftingMaterial.getItemStack(1, 2));