upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-13 16:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes.

Browse Source
This commit is contained in:
MysteriousAges committed 2013-09-29 19:41:16 -07:00
1 parent 0e77348285
commit fa2590d41e
4 files changed
+11 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

magicbees_res/changelog.txt
+3
View File
@@ -1,3 +1,6 @@
2.1.7
Some non-bee bug removals.
2.1.6
How about not crashing because I forgot a colour tuple? >.>
Presenting a new bee species: You can't see it though, because it's invisible. >_>
magicbees_src/magicbees/item/types/HiveFrameType.java
+4 -4
View File
@@ -4,13 +4,13 @@ import magicbees.main.utils.LocalizationManager;
public enum HiveFrameType
{
MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.5f),
MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.6f),
RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f, 0.5f),
GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.1f),
GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.01f),
METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f),
NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 0.8f),
NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f),
TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f),
OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 0.8f),
OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f),
;
private HiveFrameType(String name, int damage,
magicbees_src/magicbees/main/utils/CraftingManager.java
+4 -7
View File
@@ -240,13 +240,10 @@ public class CraftingManager
input, Config.pollen.getStackForType(PollenType.PHASED)
});
if (!ThaumcraftHelper.isActive())
{
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
ItemInterface.getItem("frameProven")
});
}
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
ItemInterface.getItem("frameProven")
});
if (OreDictionary.getOres("ingotCopper").size() <= 0)
{
magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java
-7
View File
@@ -282,12 +282,6 @@ public class ThaumcraftHelper
'C', new ItemStack(Config.tcMiscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal())
});
frameOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", new ItemStack(Config.hiveFrameOblivion),
new AspectList().add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 5), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
ItemInterface.getItem("frameProven")
});
essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE),
new ItemStack(Block.plantRed), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4));
@@ -327,7 +321,6 @@ public class ThaumcraftHelper
}
private static Object frameMagic;
private static Object frameOblivion;
private static Object thaumScoop;
private static Object thaumGrafter;
private static Object singularityA;