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

Reset version to 2.3.6 (never actually released, herpderp.)

Browse Source 
Added Void metal bee.
Moved EffectData into effect package.
Changed Aura Node flower provider to correctly identify all varities of node.
This commit is contained in:
MysteriousAges committed 2015-09-24 18:04:12 -07:00
1 parent 66c0f02a6e
commit 800799e85c
20 files changed
+53 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/bees/BeeGenomeManager.java
+10
View File
@@ -974,6 +974,15 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplaceTCVoid() {
IAllele[] genome = getTemplateBaseMetallic();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_VOID;
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceUp1");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectGlacial");
return genome; }
private static IAllele[] getTemplateEEBase() {
IAllele[] genome = getTemplateModBase();
@@ -988,6 +997,7 @@ public class BeeGenomeManager {
IAllele[] genome = getTemplateEEBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EE_MINIUM;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectTransmuting;
return genome;
}
src/main/java/magicbees/bees/BeeMutation.java
+9 -4
View File
@@ -267,6 +267,10 @@ public class BeeMutation implements IBeeMutation {
.setBiomeRequired(Type.PLAINS);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.TC_PORK, 12)
.setBiomeRequired(Type.MOUNTAIN);
new BeeMutation(BeeSpecies.IRON, BeeSpecies.TC_TAINT, BeeSpecies.TC_VOID, 5)
.setBiomeRequired(Type.MAGICAL)
.setRequiresNight();
}
if (ArsMagicaHelper.isActive()) {
@@ -554,16 +558,17 @@ public class BeeMutation implements IBeeMutation {
else if (this.requiredBlockOreDictEntry != null) {
ArrayList<ItemStack> ores = OreDictionary.getOres(this.requiredBlockOreDictEntry);
if (ores != null && 0 < ores.size()) {
conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"), ores.get(0).getDisplayName()));
String displayName = ores.get(0).getDisplayName();
conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"), displayName));
}
}
else {
else if (this.requiredBlock != null) {
int meta = OreDictionary.WILDCARD_VALUE;
if (this.requiredBlockMeta != OreDictionary.WILDCARD_VALUE) {
meta = this.requiredBlockMeta;
}
conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"),
new ItemStack(this.requiredBlock, 1, meta).getDisplayName()));
String displayName = new ItemStack(this.requiredBlock, 1, meta).getDisplayName();
conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"), displayName));
}
}
src/main/java/magicbees/bees/BeeProductHelper.java
+1
View File
@@ -285,6 +285,7 @@ public class BeeProductHelper {
TC_CHICKEN.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetChicken, 1), 0.9f);
TC_BEEF.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetBeef, 1), 0.9f);
TC_PORK.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetPork, 1), 0.9f);
TC_VOID.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetMetal, 1, ThaumcraftHelper.NuggetType.VOID_METAL.ordinal()), 0.155f);
}
}
src/main/java/magicbees/bees/BeeSpecies.java
+4
View File
@@ -226,6 +226,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_PORK("TCPork", "porcina", BeeClassification.FLESHY,
0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_VOID("TCVoid", "obscurus", BeeClassification.METALLIC,
0x180A29, 0x4B2A74, EnumTemperature.ICY, EnumHumidity.NORMAL, false, false),
// --------- Equivalent Exchange Bees -----------------------------------------------------------------------------
EE_MINIUM("EEMinium", "mutabilis", BeeClassification.ALCHEMICAL,
@@ -422,6 +424,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TC_CHICKEN.registerGenomeTemplate(BeeGenomeManager.getTemplateTCChicken());
TC_BEEF.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBeef());
TC_PORK.registerGenomeTemplate(BeeGenomeManager.getTemplateTCPork());
TC_VOID.registerGenomeTemplate(BeeGenomeManager.getTemplaceTCVoid());
EE_MINIUM.registerGenomeTemplate(BeeGenomeManager.getTemplateEEMinium());
AM_ESSENCE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMEssence());
AM_QUINTESSENCE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMQuintessence());
@@ -486,6 +489,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TC_PORK.setInactive();
TC_WISPY.setInactive();
TC_VOID.setInactive();
}
BeeProductHelper.initEquivalentExchange3Species();
src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java
+2 -2
View File
@@ -41,8 +41,8 @@ public class AlleleEffectCrumbling extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
storedData = new magicbees.bees.EffectData(1, 0, 0);
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0);
}
return storedData;
}
src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java
-1
View File
@@ -3,7 +3,6 @@ package magicbees.bees.allele.effect;
import java.util.List;
import magicbees.bees.AlleleEffect;
import magicbees.bees.EffectData;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java
+2 -2
View File
@@ -20,8 +20,8 @@ public class AlleleEffectEmpowering extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
storedData = new magicbees.bees.EffectData(1, 0, 0);
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0);
}
return storedData;
}
src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java
+2 -2
View File
@@ -23,8 +23,8 @@ public class AlleleEffectNodeConversion extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
storedData = new magicbees.bees.EffectData(1, 0, 0);
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0);
}
return storedData;
}
src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java
+2 -2
View File
@@ -19,8 +19,8 @@ public class AlleleEffectNodeRepair extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
storedData = new magicbees.bees.EffectData(1, 0, 0);
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0);
}
return storedData;
}
src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java
-1
View File
@@ -3,7 +3,6 @@ package magicbees.bees.allele.effect;
import java.util.List;
import magicbees.bees.AlleleEffect;
import magicbees.bees.EffectData;
import magicbees.item.ItemArmorApiarist;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java
+2 -2
View File
@@ -20,8 +20,8 @@ public class AlleleEffectRecharge extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
storedData = new magicbees.bees.EffectData(1, 0, 0);
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0);
}
return storedData;
}
src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java
+1 -2
View File
@@ -3,7 +3,6 @@ package magicbees.bees.allele.effect;
import java.util.List;
import magicbees.bees.AlleleEffect;
import magicbees.bees.EffectData;
import magicbees.item.ItemArmorApiarist;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
@@ -39,7 +38,7 @@ public class AlleleEffectSpawnMob extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
// Throttle; Ready to spawn
storedData = new EffectData(1, 1, 0);
}
src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java
+1 -2
View File
@@ -1,7 +1,6 @@
package magicbees.bees.allele.effect;
import magicbees.bees.AlleleEffect;
import magicbees.bees.EffectData;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLiving;
@@ -25,7 +24,7 @@ public class AlleleEffectSpawnMobWeighted extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new EffectData(1, 0, 0);
}
return storedData;
src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java
+2 -2
View File
@@ -19,8 +19,8 @@ public class AlleleEffectTransmuting extends AlleleEffect {
@Override
public IEffectData validateStorage(IEffectData storedData) {
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
storedData = new magicbees.bees.EffectData(1, 0, 0);
if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) {
storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0);
}
return storedData;
}
src/main/java/magicbees/bees/EffectData.java → src/main/java/magicbees/bees/allele/effect/EffectData.java
+1 -1
View File
@@ -1,4 +1,4 @@
package magicbees.bees;
package magicbees.bees.allele.effect;
import net.minecraft.nbt.NBTTagCompound;
import forestry.api.genetics.IEffectData;
src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java
+5 -3
View File
@@ -7,8 +7,9 @@ import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.nodes.INode;
import forestry.api.genetics.IFlower;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IPollinatable;
@@ -25,8 +26,9 @@ public class FlowerProviderAuraNode extends FlowerProvider {
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) {
Block block = world.getBlock(x, y, z);
int meta = world.getBlockMetadata(x, y, z);
for (IFlower flower : flowers) {
if (flower.getBlock() == block && (flower.getMeta() == OreDictionary.WILDCARD_VALUE || flower.getMeta() == meta)) {
if (block.hasTileEntity(meta)) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof INode) {
return true;
}
}
src/main/java/magicbees/main/utils/VersionInfo.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class VersionInfo
public static final String Logo = "/gfx/magicbees/logo.png";
public static final String Depends = "required-after:Forestry@[3.1.1.4,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:AWWayofTime;after:Botania;after:appliedenergistics2";
public static final String Depends = "required-after:Forestry@[3.6,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2";
boolean criticalUpdate;
boolean newVersion;
src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java
+4 -4
View File
@@ -57,13 +57,15 @@ public class ThaumcraftHelper {
LEAD,
QUICKSILVER,
THAUMIUM,
_7, _8, _9, _10, _11, _12, _13, _14, _15,
VOID_METAL,
_8, _9, _10, _11, _12, _13, _14, _15,
NATIVE_IRON,
NATIVE_COPPER,
NATIVE_TIN,
NATIVE_SILVER,
NATIVE_LEAD,
_21, _22, _23, _24, _25, _26, _27, _28, _29, _30,
NATIVE_CINNABAR,
_22, _23, _24, _25, _26, _27, _28, _29, _30,
NATIVE_GOLD,
;
}
@@ -174,10 +176,8 @@ public class ThaumcraftHelper {
public static Item filledJar;
public static Item miscResource;
//public static Item tcEssentiaBottle;
public static Item shard;
public static Item golem;
//public static Item tcWispEssence;
public static Item nuggetMetal;
public static Item nuggetChicken;
public static Item nuggetBeef;