From 906b97064eda4591d0e8f42e984d09a045142e2b Mon Sep 17 00:00:00 2001 From: Quantumlyy Date: Tue, 12 Dec 2023 10:36:47 +0100 Subject: [PATCH] remove queen aging --- dependencies.gradle | 4 ++-- .../tileentity/TileEntityPhialingCabinet.java | 23 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 493ea46..9eb24e3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,9 +5,9 @@ dependencies { compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.3:dev') compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.4.0:dev') - compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false} + compile('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.10.3-GTNH:api') {transitive = false} - compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} + compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.101:dev') { transitive = false } } diff --git a/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java b/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java index 3038cc9..cb7fa12 100644 --- a/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java +++ b/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java @@ -1,6 +1,5 @@ package magicbees.tileentity; -import java.lang.reflect.Field; import java.util.Objects; import forestry.api.apiculture.*; @@ -63,10 +62,6 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont * Math.max(productionMultiplier, 1.0F)); addToContainer(aspect, amount); - - try { - drainQueen(beeHousing, beekeepingLogic, modifier, queen); - } catch (Exception ignored) {} } } } catch (Exception ignored) {} @@ -76,24 +71,6 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont increment++; } - private void drainQueen(IBeeHousing housing, IBeekeepingLogic beekeepingLogic, IBeeModifier modifier, IBee queen) throws NoSuchFieldException, IllegalAccessException { - float lifespanModifier = modifier.getLifespanModifier(queen.getGenome(), queen.getMate(), 1.0f); - queen.age(housing.getWorld(), lifespanModifier); - - // Write the changed queen back into the item stack. - NBTTagCompound nbttagcompound = new NBTTagCompound(); - queen.writeToNBT(nbttagcompound); - housing.getBeeInventory().getQueen().setTagCompound(nbttagcompound); - - Field beeProgress = beekeepingLogic.getClass().getDeclaredField("beeProgress"); - beeProgress.setAccessible(true); - Field beeProgressMax = beekeepingLogic.getClass().getDeclaredField("beeProgressMax"); - beeProgressMax.setAccessible(true); - - beeProgress.set(beekeepingLogic, queen.getHealth()); - beeProgressMax.set(beekeepingLogic, queen.getMaxHealth()); - } - @Override public AspectList getAspects() { return this.essentia;