Update to forestry 3.6 API.

Adds Aura node Recharge effect.
This commit is contained in:
MysteriousAges committed 2015-09-03 16:17:05 -07:00
1 parent 922a8fffd6
commit 4c93eb6bf4
16 files changed
+317 -83

No files matched your search

+15 -7
View File
@@ -478,7 +478,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
// These species should be fixed. ¯\_(ツ)_/¯
TC_TAINT.setInactive();
TC_ATTRACT.setInactive();
TC_REJUVENATING.setInactive();
//TC_REJUVENATING.setInactive();
BeeProductHelper.initEquivalentExchange3Species();
if (!EquivalentExchangeHelper.isActive()) {
@@ -556,7 +556,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
private boolean isNocturnal;
private IClassification branch;
private HashMap<ItemStack, Float> products;
@Deprecated
private HashMap<ItemStack, Integer> oldProducts;
private HashMap<ItemStack, Float> specialties;
@Deprecated
private HashMap<ItemStack, Integer> oldSpecialties;
private IAllele genomeTemplate[];
private String uid;
private boolean dominant;
@@ -604,7 +608,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
isSecret = isSpeciesSecret;
isCounted = isSpeciesCounted;
products = new HashMap<ItemStack, Float>();
oldProducts = new HashMap<ItemStack, Integer>();
specialties = new HashMap<ItemStack, Float>();
oldSpecialties = new HashMap<ItemStack, Integer>();
this.branch = classification;
this.branch.addMemberSpecies(this);
this.isNocturnal = isSpeciesNocturnal;
@@ -617,23 +623,25 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
@Deprecated
public BeeSpecies addProduct(ItemStack produce, int percentChance) {
products.put(produce, percentChance / 100f);
return this;
// Don't use this plz.
return null;
}
public BeeSpecies addProduct(ItemStack produce, float chance) {
products.put(produce, chance);
oldProducts.put(produce, (int)(chance * 100));
return this;
}
@Deprecated
public BeeSpecies addSpecialty(ItemStack produce, int percentChance) {
specialties.put(produce, percentChance / 100f);
return this;
// Don't use this plz.
return null;
}
public BeeSpecies addSpecialty(ItemStack produce, float chance) {
specialties.put(produce, chance);
oldSpecialties.put(produce, (int)(chance * 100));
return this;
}
@@ -719,13 +727,13 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
@Override
@Deprecated
public HashMap<ItemStack, Integer> getProducts() {
return null;
return oldProducts;
}
@Override
@Deprecated
public HashMap<ItemStack, Integer> getSpecialty() {
return null;
return oldSpecialties;
}
@Override