From 7416d21f6fcb73032eb2e58f0b7482ce65b2c7d5 Mon Sep 17 00:00:00 2001 From: Quantumlyy Date: Fri, 8 Dec 2023 23:22:19 +0100 Subject: [PATCH] use config for phialing cabinet values --- src/main/java/magicbees/main/Config.java | 20 +++++++++++++++++++ .../tileentity/TileEntityPhialingCabinet.java | 10 +++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 43d2d40..72d00a5 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -91,6 +91,8 @@ public class Config { public static double thaumcraftSaplingDroprate; public static int aromaticLumpSwarmerRate; public static int thaumcraftNodeMaxSize; + public static int thaumcraftEssentiaBeePhialingCabinetTimeBetween; + public static int thaumcraftEssentiaBeePhialingCabinetAmount; public static boolean arsMagicaActive; public static boolean baublesActive; @@ -336,6 +338,24 @@ public class Config { 32767); thaumcraftNodeMaxSize = p.getInt(256); + p = configuration.get( + CATEGORY_GENERAL, + "thaumcraftEssentiaBeePhialingCabinetTimeBetween", + 10, + "The time in ticks between Phialing Cabinet essentia generation", + 1, + 32767); + thaumcraftEssentiaBeePhialingCabinetTimeBetween = p.getInt(10); + + p = configuration.get( + CATEGORY_GENERAL, + "thaumcraftEssentiaBeePhialingCabinetAmount", + 2, + "The amount that the Phialing Cabinet generates on every round", + 1, + 32767); + thaumcraftEssentiaBeePhialingCabinetAmount = p.getInt(2); + p = configuration.get(CATEGORY_GENERAL, "moonDialShowText", false); p.comment = "set to true to show the current moon phase in mouse-over text."; moonDialShowsPhaseInText = p.getBoolean(false); diff --git a/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java b/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java index 8e36ba7..173408e 100644 --- a/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java +++ b/src/main/java/magicbees/tileentity/TileEntityPhialingCabinet.java @@ -2,6 +2,7 @@ package magicbees.tileentity; import java.util.Objects; +import magicbees.main.Config; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -31,7 +32,7 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont // If there's no stored aspect we shouldn't even check for the above block. if (aspect == null) return; - if (increment >= 20) { + if (increment % Config.thaumcraftEssentiaBeePhialingCabinetTimeBetween == 0) { try { TileEntity above = worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord); if (IBeeHousing.class.isAssignableFrom(above.getClass())) { @@ -44,11 +45,14 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont IBee queen = BeeManager.beeRoot.getMember(queenStack); String queenUID = queen.getGenome().getPrimary().getUID(); - if (Objects.equals(queenUID, BeeSpecies.TC_ESSENTIA.getSpecies().getUID())) - this.myAspects.add(aspect, 1); + if (Objects.equals(queenUID, BeeSpecies.TC_ESSENTIA.getSpecies().getUID())) { + this.myAspects.add(aspect, Config.thaumcraftEssentiaBeePhialingCabinetAmount); + increment = 0; + } } } catch (Exception ignored) {} } + increment++; }