diff --git a/magicbees_res/assets/magicbees/textures/aspects/tempus.png b/magicbees_res/assets/magicbees/textures/aspects/tempus.png index d04da05..46ce5f5 100644 Binary files a/magicbees_res/assets/magicbees/textures/aspects/tempus.png and b/magicbees_res/assets/magicbees/textures/aspects/tempus.png differ diff --git a/magicbees_res/changelog.txt b/magicbees_res/changelog.txt index bb2e216..7f0ed48 100644 --- a/magicbees_res/changelog.txt +++ b/magicbees_res/changelog.txt @@ -1,5 +1,10 @@ +2.1.9 +Adding configuration option to not spawn special hives in Magic Biomes for people who hate fun, and specialness. +Adding a shadow to the Tempus aspect for Vazkii. + 2.1.8 Fixing inconcistent recipes between Thaumonomicon & actual crafting +Added missing centrifuge recipe for the Transmuting combs. This is the source of Unstable Propolis. 2.1.7 Some non-bee bug removals. diff --git a/magicbees_src/magicbees/bees/AlleleEffectSpawnMobWeighted.java b/magicbees_src/magicbees/bees/AlleleEffectSpawnMobWeighted.java index c140673..52eef63 100644 --- a/magicbees_src/magicbees/bees/AlleleEffectSpawnMobWeighted.java +++ b/magicbees_src/magicbees/bees/AlleleEffectSpawnMobWeighted.java @@ -28,7 +28,7 @@ public class AlleleEffectSpawnMobWeighted extends AlleleEffect @Override public IEffectData validateStorage(IEffectData storedData) { - if (storedData == null) + if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) { storedData = new EffectData(1, 0, 0); } diff --git a/magicbees_src/magicbees/main/Config.java b/magicbees_src/magicbees/main/Config.java index 69649d7..75598a1 100644 --- a/magicbees_src/magicbees/main/Config.java +++ b/magicbees_src/magicbees/main/Config.java @@ -63,6 +63,7 @@ public class Config public boolean AreMagicPlanksFlammable; public boolean UseImpregnatedStickInTools; public boolean MoonDialShowsPhaseInText; + public boolean DoSpecialHiveGen; public String ThaumaturgeExtraItems; public int CapsuleStackSizeMax; public boolean DoHiveRetrogen; @@ -403,6 +404,10 @@ public class Config p.comment = "set to true to show the current moon phase in mouse-over text."; this.MoonDialShowsPhaseInText = p.getBoolean(false); + p = configuration.get("general", "doSpecialHiveGen", true); + p.comment = "Set to false if you hate fun and do not want special hives generating in Magic biomes."; + this.DoSpecialHiveGen = p.getBoolean(true); + p = configuration.get("Retrogen", "doHiveRetrogen", false); p.comment = "Set to true to enable retroactive worldgen of Magic Bees hives."; this.DoHiveRetrogen = p.getBoolean(false); diff --git a/magicbees_src/magicbees/main/utils/CraftingManager.java b/magicbees_src/magicbees/main/utils/CraftingManager.java index daed5e0..82f5d5f 100644 --- a/magicbees_src/magicbees/main/utils/CraftingManager.java +++ b/magicbees_src/magicbees/main/utils/CraftingManager.java @@ -465,6 +465,9 @@ public class CraftingManager RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TEMPORAL), new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.pollen.getStackForType(PollenType.PHASED), new ItemStack(Config.fHoneydew, 1)}, new int[] {100, 5, 60}); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TRANSMUTED), + new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.UNSTABLE)}, + new int[] {80, 80, 15}); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AIRY), new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.feather) }, diff --git a/magicbees_src/magicbees/world/WorldTicker.java b/magicbees_src/magicbees/world/WorldTicker.java index 439708c..ecb6bda 100644 --- a/magicbees_src/magicbees/world/WorldTicker.java +++ b/magicbees_src/magicbees/world/WorldTicker.java @@ -32,7 +32,7 @@ public class WorldTicker implements ITickHandler int dimensionID = world.provider.dimensionId; LinkedList chunkList = chunkRegenList.get(dimensionID); - if (chunkList != null && chunkList.size() > 0) + if (chunkList != null && chunkList.peekFirst() != null) { ChunkCoords coords = chunkList.removeFirst(); diff --git a/magicbees_src/magicbees/world/feature/FeatureHive.java b/magicbees_src/magicbees/world/feature/FeatureHive.java index 9eb7b07..6b4a456 100644 --- a/magicbees_src/magicbees/world/feature/FeatureHive.java +++ b/magicbees_src/magicbees/world/feature/FeatureHive.java @@ -153,7 +153,7 @@ public class FeatureHive netherQuartzGen.generateVein(world, random, coordX, coordY, coordZ - 1, 4); } } - else + else if (MagicBees.getConfig().DoSpecialHiveGen) { int coordY = random.nextInt(13) + 5; @@ -216,7 +216,7 @@ public class FeatureHive } } } - else + else if (MagicBees.getConfig().DoSpecialHiveGen) { // 1 per gen int coordY = random.nextInt(5) + 5;