From 4bef945c4e737a619e344bf1fad467020f890ef4 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Mon, 10 Apr 2023 20:21:47 +0200 Subject: [PATCH 1/7] Prevent overflow --- .../magicbees/bees/allele/effect/AlleleEffectEmpowering.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index 42a4be7..5c36ca7 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -95,16 +95,17 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc if (world.rand.nextInt(randBase) < 120) { Aspect aspectToAdd; int rollAttempts = 0; + short amount = (short) ((int) did + world.rand.nextInt((int) (2f * did))); do { aspectToAdd = getWeightedRandomAspect(world.rand); ++rollAttempts; - } while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize - 1) && rollAttempts < 20); + } while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize - amount) + && rollAttempts < 20); if (20 <= rollAttempts) { continue; } - short amount = (short) ((int) did + world.rand.nextInt((int) (2f * did))); aspectsBase.add(aspectToAdd, amount); node.getAspects().add(aspectToAdd, amount); updateNode(node, world); From 6bd5cc24d3e07548541bd503e2d945b4abdec6c2 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Mon, 10 Apr 2023 20:23:52 +0200 Subject: [PATCH 2/7] Implement accelerated effect on Rejuvenating bee effect --- .../allele/effect/AlleleEffectRecharge.java | 73 ++++++++++++++++++- .../utils/compat/thaumcraft/NodeHelper.java | 2 +- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java index f282c91..24e1495 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java @@ -1,6 +1,8 @@ package magicbees.bees.allele.effect; -import java.util.List; +import static magicbees.main.utils.compat.thaumcraft.NodeHelper.updateNode; + +import java.util.*; import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; @@ -11,12 +13,16 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.nodes.INode; +import forestry.api.apiculture.IAlleleBeeAcceleratableEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; -public class AlleleEffectRecharge extends AlleleEffect { +public class AlleleEffectRecharge extends AlleleEffect implements IAlleleBeeAcceleratableEffect { public AlleleEffectRecharge(String id, boolean isDominant) { super(id, isDominant, 20); @@ -25,7 +31,7 @@ public class AlleleEffectRecharge extends AlleleEffect { @Override public IEffectData validateStorage(IEffectData storedData) { - if (storedData == null || !(storedData instanceof magicbees.bees.allele.effect.EffectData)) { + if (!(storedData instanceof EffectData)) { storedData = new magicbees.bees.allele.effect.EffectData(1, 0, 0); } return storedData; @@ -45,4 +51,65 @@ public class AlleleEffectRecharge extends AlleleEffect { return storedData; } + + @Override + public IEffectData doEffectAccelerated(IBeeGenome genome, IEffectData storedData, IBeeHousing housing, float did) { + storedData.setInteger(0, 0); + World world = housing.getWorld(); + ChunkCoordinates coords = housing.getCoordinates(); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); + int range = Math + .max((int) Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)), 1); + List chunks = BlockUtil.getChunksInSearchRange(world, coords.posX, coords.posZ, range); + + int idid = (int) did; + + List nodes = new ArrayList<>(idid); + Collections.shuffle(chunks); + for (Chunk chunk : chunks) { + List l = NodeHelper.findNodesInChunkWithinRange(chunk, coords.posX, coords.posY, coords.posZ, range); + nodes.addAll(l); + idid -= l.size(); + if (idid <= 0) { + while (idid < 0) { + nodes.remove(0); + idid++; + } + break; + } + } + + if (nodes.isEmpty()) return storedData; + + did /= (float) nodes.size(); + if (did < 1f) did = 1f; + + for (INode node : nodes) { + AspectList baseAspects = node.getAspectsBase(); + AspectList currentAspects = node.getAspects(); + + HashMap toAdd = new HashMap<>(); + int total = 0; + + for (Map.Entry aspect : baseAspects.aspects.entrySet()) { + int diff = aspect.getValue() - currentAspects.getAmount(aspect.getKey()); + if (diff <= 0) continue; + toAdd.put(aspect.getKey(), diff); + total += diff; + } + + if (total == 0) continue; + + short amount = (short) Math.min(total + world.rand.nextInt(total), (int) did); + if (amount <= 0) amount = 1; + + for (Map.Entry aspect : toAdd.entrySet()) { + currentAspects.add(aspect.getKey(), Math.min(aspect.getValue(), amount)); + } + + updateNode(node, world); + } + + return storedData; + } } 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 da157f1..94bf226 100644 --- a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java @@ -87,7 +87,7 @@ public class NodeHelper { for (Aspect aspect : nearestNode.getAspects().getAspects()) { int diff = baseAspects.getAmount(aspect) - currentAspects.getAmount(aspect); if (1 < diff) { - nearestNode.addToContainer(aspect, world.rand.nextInt(diff - 1) + 1); + nearestNode.addToContainer(aspect, world.rand.nextInt(diff) + 1); nodeChanged = true; } else if (diff == 1) { nearestNode.addToContainer(aspect, 1); From caca6a6329600f06d101e1aac0cfab76b56216cd Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Mon, 10 Apr 2023 20:29:06 +0200 Subject: [PATCH 3/7] Sanity check --- .../magicbees/bees/allele/effect/AlleleEffectEmpowering.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index 5c36ca7..4a7d93e 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -95,7 +95,8 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc if (world.rand.nextInt(randBase) < 120) { Aspect aspectToAdd; int rollAttempts = 0; - short amount = (short) ((int) did + world.rand.nextInt((int) (2f * did))); + short amount = (short) Math + .min((int) did + world.rand.nextInt((int) (2f * did)), Config.thaumcraftNodeMaxSize); do { aspectToAdd = getWeightedRandomAspect(world.rand); ++rollAttempts; From 0149c34d1d3d96c42db004a965c7d5b62cf105bb Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Mon, 10 Apr 2023 20:29:17 +0200 Subject: [PATCH 4/7] Keep as int --- .../java/magicbees/bees/allele/effect/AlleleEffectRecharge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java index 24e1495..e5aefb6 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java @@ -100,7 +100,7 @@ public class AlleleEffectRecharge extends AlleleEffect implements IAlleleBeeAcce if (total == 0) continue; - short amount = (short) Math.min(total + world.rand.nextInt(total), (int) did); + int amount = Math.min(total + world.rand.nextInt(total), (int) did); if (amount <= 0) amount = 1; for (Map.Entry aspect : toAdd.entrySet()) { From 72b71021de4b494c406ca6c65434614c38070c29 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:20:53 +0200 Subject: [PATCH 5/7] Fix --- .../magicbees/bees/allele/effect/AlleleEffectEmpowering.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index 4a7d93e..78142f8 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -100,13 +100,15 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc do { aspectToAdd = getWeightedRandomAspect(world.rand); ++rollAttempts; - } while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize - amount) + } while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize - 1) && rollAttempts < 20); if (20 <= rollAttempts) { continue; } +amount=Math.min(Config.thaumcraftNodeMaxSize-aspectsBase.getAmount(aspectToAdd),amount); + aspectsBase.add(aspectToAdd, amount); node.getAspects().add(aspectToAdd, amount); updateNode(node, world); From 702cffe4581e69b9147327888e07525352e09434 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:30:04 +0200 Subject: [PATCH 6/7] Writing code and commiting on the phone be like --- .../magicbees/bees/allele/effect/AlleleEffectEmpowering.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index 78142f8..dd0b72e 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -107,7 +107,7 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc continue; } -amount=Math.min(Config.thaumcraftNodeMaxSize-aspectsBase.getAmount(aspectToAdd),amount); + amount = (short) Math.min(Config.thaumcraftNodeMaxSize - aspectsBase.getAmount(aspectToAdd), amount); aspectsBase.add(aspectToAdd, amount); node.getAspects().add(aspectToAdd, amount); From e5f0fc23689eeb70d891321fc19f4f2b5bb9903c Mon Sep 17 00:00:00 2001 From: Runakai1 Date: Wed, 12 Apr 2023 14:10:24 +0200 Subject: [PATCH 7/7] Spotless --- .../magicbees/bees/allele/effect/AlleleEffectEmpowering.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index dd0b72e..c062107 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -100,8 +100,7 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc do { aspectToAdd = getWeightedRandomAspect(world.rand); ++rollAttempts; - } while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize - 1) - && rollAttempts < 20); + } while (aspectsBase.getAmount(aspectToAdd) > (Config.thaumcraftNodeMaxSize - 1) && rollAttempts < 20); if (20 <= rollAttempts) { continue;