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

correctly check for the species

Browse Source
This commit is contained in:
Quantumlyy committed 2023-12-09 00:53:21 +01:00
1 parent 29e72ed7fc
commit 6529e7245d
3 files changed
+15 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/bees/BeeSpecies.java
+1 -1
View File
@@ -459,12 +459,12 @@ public enum BeeSpecies {
BeeProductHelper.initThaumcraftProducts();
if (!ThaumcraftHelper.isActive()) {
TC_CHAOS.setInactive();
TC_ESSENTIA.setInactive();
TC_AIR.setInactive();
TC_FIRE.setInactive();
TC_WATER.setInactive();
TC_EARTH.setInactive();
TC_ORDER.setInactive();
TC_ESSENTIA.setInactive();
TC_VIS.setInactive();
TC_REJUVENATING.setInactive();
src/main/java/magicbees/main/Config.java
+4 -7
View File
@@ -215,7 +215,6 @@ public class Config {
voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax);
setupThaumcraftItems();
setupPhialingCabinet();
setupBotaniaItems();
setupOreDictionaryEntries();
@@ -503,6 +502,10 @@ public class Config {
visAuraProvider = new BlockVisAuraProvider();
GameRegistry.registerBlock(visAuraProvider, "visAuraProvider");
GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider");
phialingCabinet = new BlockPhialingCabinet();
GameRegistry.registerBlock(phialingCabinet, "phialingCabinet");
GameRegistry.registerTileEntity(TileEntityPhialingCabinet.class, TileEntityPhialingCabinet.tileEntityName);
}
}
@@ -525,12 +528,6 @@ public class Config {
}
}
public void setupPhialingCabinet() {
phialingCabinet = new BlockPhialingCabinet();
GameRegistry.registerBlock(phialingCabinet, "phialingCabinet");
GameRegistry.registerTileEntity(TileEntityPhialingCabinet.class, TileEntityPhialingCabinet.tileEntityName);
}
private void setupThaumcraftBackpacks() {
try {
// 0x8700C6 is a purple-y colour, which is associated with Thaumcraft.
src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java
+10 -9
View File
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBeeHousing;
import magicbees.bees.BeeManager;
import forestry.apiculture.genetics.BeeGenome;
import magicbees.bees.BeeSpecies;
import magicbees.main.Config;
import thaumcraft.api.aspects.Aspect;
@@ -37,16 +37,17 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont
try {
TileEntity above = worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord);
if (IBeeHousing.class.isAssignableFrom(above.getClass())) {
IBeeHousing heeHousing = (IBeeHousing) above;
ItemStack queenStack = heeHousing.getBeeInventory().getQueen();
IBeeHousing beeHousing = (IBeeHousing) above;
ItemStack queenStack = beeHousing.getBeeInventory().getQueen();
// If the bee isn't a queen then what are we even doing?
if (!BeeManager.beeRoot.isMated(queenStack)) return;
// This performs all the checks to see if the bee is a living queen and if the species conditions
// are met.
if (!beeHousing.getBeekeepingLogic().canWork()) return;
IBee queen = BeeManager.beeRoot.getMember(queenStack);
String queenUID = queen.getGenome().getPrimary().getUID();
IAlleleBeeSpecies queenSpecies = BeeGenome.getSpecies(queenStack);
if (queenSpecies == null) return;
if (Objects.equals(queenUID, BeeSpecies.TC_ESSENTIA.getSpecies().getUID())) {
if (Objects.equals(queenSpecies.getUID(), BeeSpecies.TC_ESSENTIA.getSpecies().getUID())) {
addToContainer(aspect, Config.thaumcraftEssentiaBeePhialingCabinetAmount);
increment = 0;
}