diff --git a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java index bfb9c35e1..6a057d8fa 100644 --- a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java +++ b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java @@ -52,8 +52,6 @@ import net.minecraft.server.MinecraftServer; @Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", canBeDeactivated = false, guiFactory = "ellpeck.actuallyadditions.config.GuiFactory") public class ActuallyAdditions{ - public static boolean isCaveMode = true; //TODO - @Instance(ModUtil.MOD_ID) public static ActuallyAdditions instance; diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java index 608867658..411d580af 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java @@ -10,7 +10,6 @@ package ellpeck.actuallyadditions.items; -import ellpeck.actuallyadditions.ActuallyAdditions; import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.items.base.*; import ellpeck.actuallyadditions.items.lens.ItemLens; @@ -21,7 +20,6 @@ import ellpeck.actuallyadditions.material.InitArmorMaterials; import ellpeck.actuallyadditions.material.InitToolMaterials; import ellpeck.actuallyadditions.util.CompatUtil; import ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -137,17 +135,9 @@ public class InitItems{ public static Item itemExplosionLens; public static Item itemDamageLens; - public static Item itemPotatoSeeds; - public static Item itemCarrotSeeds; - public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); - if(ActuallyAdditions.isCaveMode){ - itemPotatoSeeds = new ItemSeed("itemPotatoSeeds", "seedPotato", Blocks.potatoes, null, 0); - itemCarrotSeeds = new ItemSeed("itemCarrotSeeds", "seedCarrot", Blocks.carrots, null, 0); - } - itemCrateKeeper = new ItemGeneric("itemCrateKeeper"); itemColorLens = new ItemLens("itemColorLens", Lenses.LENS_COLOR); itemExplosionLens = new ItemLens("itemExplosionLens", Lenses.LENS_DETONATION); diff --git a/src/main/java/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java index 05b47ab65..4d82f82dd 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java @@ -10,7 +10,6 @@ package ellpeck.actuallyadditions.items.lens; -import ellpeck.actuallyadditions.ActuallyAdditions; import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; @@ -101,11 +100,6 @@ public class LensNoneRecipeHandler{ addRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(Items.redstone), 4000); recipesGlowstoneRedstone[1] = Util.GetRecipes.lastReconstructorRecipe(); } - - if(ActuallyAdditions.isCaveMode){ - addRecipe(new ItemStack(Blocks.dirt), new ItemStack(Blocks.grass), 50000); - addRecipe(new ItemStack(Blocks.grass), new ItemStack(Blocks.tallgrass), 50000); - } } public static void addRecipe(ItemStack input, ItemStack output, int energyUse){