diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java | 16 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java | 23 |
2 files changed, 8 insertions, 31 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index c74bb116b0..fb77c4c2e0 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -17,7 +17,6 @@ import net.minecraftforge.common.ChestGenHooks; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.utils.StringUtil; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; public class FR_ItemRegistry { @@ -56,17 +55,10 @@ public class FR_ItemRegistry { // Magic Bee like Frames - if (!CORE.GTNH) { - hiveFrameVoid = new MB_ItemFrame( - MB_FrameType.VOID, - EnumRarity.rare, - "Makes your bee die in the blink of an eye."); - } else { - hiveFrameVoid = new MB_ItemFrame( - MB_FrameType.USELESS, - EnumRarity.common, - "No more cheaty frames for GTNH players."); - } + hiveFrameVoid = new MB_ItemFrame( + MB_FrameType.USELESS, + EnumRarity.common, + "No more cheaty frames for GTNH players."); hiveFrameAccelerated = new MB_ItemFrame( MB_FrameType.ACCELERATED, diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java index ecf7232f02..3ba28fd98c 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -4,7 +4,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -65,24 +64,10 @@ public class FR_Gregtech_Recipes { rod_Uranium, rod_Uranium, hiveFrameMutagenic); - if (!CORE.GTNH) { - RecipeUtils.addShapedGregtechRecipe( - "stickLongThaumium", - "stickThaumium", - "stickLongThaumium", - "stickLongThaumium", - ItemUtils.getSimpleStack(Items.ender_pearl), - "stickLongThaumium", - "stickThaumium", - "stickThaumium", - "stickThaumium", - hiveFrameVoid); - } else { - if (LoadedMods.MagicBees) { - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { hiveFrameVoid }, - ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1)); - } + if (LoadedMods.MagicBees) { + RecipeUtils.addShapelessGregtechRecipe( + new ItemStack[] { hiveFrameVoid }, + ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1)); } RecipeUtils.addShapedGregtechRecipe( "stickLongBlueSteel", |