From 451f183e83aa3c5848149021815143e5c88e2a1c Mon Sep 17 00:00:00 2001 From: KryptonCaptain Date: Sat, 24 Aug 2019 11:03:36 +1000 Subject: [PATCH] Add config for node max size Nexus bees can be limited in their influence, if you so choose --- build.gradle | 4 ++++ gradle.properties | 2 +- src/main/java/magicbees/main/Config.java | 6 +++++- .../magicbees/main/utils/compat/thaumcraft/NodeHelper.java | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 03c5c34..05d1545 100644 --- a/build.gradle +++ b/build.gradle @@ -87,5 +87,9 @@ task deobfJar(type: Jar) { // Generate deobfuscated classifier = 'deobf' } +artifacts { + archives deobfJar +} + task fullBuild(dependsOn: ['build', 'deobfJar']) { } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b16508c..bd2423b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version_major=2 version_minor=5 -version_rev=0 +version_rev=2 version_forestry=4.2.+ version_botania=r1.8-248 diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 25e3a16..7c59ef3 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -87,6 +87,7 @@ public class Config public static boolean logHiveSpawns; public static double thaumcraftSaplingDroprate; public static int aromaticLumpSwarmerRate; + public static int thaumcraftNodeMaxSize; public static boolean arsMagicaActive; public static boolean bloodMagicActive; @@ -313,8 +314,11 @@ public class Config p.comment = "Set to true to make Thaumium Grafter & Scoop require impregnated sticks in the recipe."; useImpregnatedStickInTools = p.getBoolean(false); - p = configuration.get(CATEGORY_GENERAL, "thaumCraftSaplingDroprate", 0.1, "The chance for thaumcraft saplings using the thaumium grafter", 0.0, 1.0); + p = configuration.get(CATEGORY_GENERAL, "thaumcraftSaplingDroprate", 0.1, "The chance for thaumcraft saplings using the thaumium grafter", 0.0, 1.0); thaumcraftSaplingDroprate = p.getDouble(0.1); + + p = configuration.get(CATEGORY_GENERAL, "thaumcraftNodeMaxSize", 256, "The maximum aspect amount Nexus bees can grow a node to", 64, 32767); + thaumcraftNodeMaxSize = p.getInt(256); p = configuration.get(CATEGORY_GENERAL, "moonDialShowText", false); p.comment = "set to true to show the current moon phase in mouse-over text."; diff --git a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java index 12f97b3..c62e098 100644 --- a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Random; +import magicbees.main.Config; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; @@ -110,7 +111,7 @@ public class NodeHelper { aspectToAdd = getWeightedRandomAspect(world.rand); ++rollAttempts; } - while (aspectsBase.getAmount(aspectToAdd) > 255 && rollAttempts < 20); + while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize -1) && rollAttempts < 20); if (20 <= rollAttempts) { return false;