From 0f9fd9bea7ef274abb5b5e4fcd0ed3c2c830c206 Mon Sep 17 00:00:00 2001 From: Daniel Mendes Date: Wed, 27 Mar 2024 18:25:26 +0000 Subject: [PATCH] New bookshelf type and books nullify each other - Added Thaumium Block as an example of a new valid bookshelf type, for testing; - Changed check for other Books of Knowledge - removed the unexplained bonus to knowledge and made it so additional Books in range stop checkSurroundings and reset knowledge to 0, to prevent multiple books using the same bookshelf setup. --- .../gadomancy/common/blocks/tiles/TileKnowledgeBook.java | 9 ++++----- .../common/integration/IntegrationAutomagy.java | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java index 9e7d301..48bf48a 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java @@ -186,9 +186,9 @@ public class TileKnowledgeBook extends SynchronizedTileEntity } else if (te != null && te instanceof IKnowledgeProvider) { this.surroundingKnowledge += ((IKnowledgeProvider) te) .getProvidedKnowledge(this.worldObj, absX, absY, absZ); - } else if (at instanceof IKnowledgeProvider) { - this.surroundingKnowledge += ((IKnowledgeProvider) at) - .getProvidedKnowledge(this.worldObj, absX, absY, absZ); + } else if (at instanceof IKnowledgeProvider && xx != 0) { + this.surroundingKnowledge = 0; + return; } else { for (BlockSnapshot sn : TileKnowledgeBook.knowledgeIncreaseMap.keySet()) { if (sn.block.equals(at) && sn.metadata == meta) { @@ -374,8 +374,7 @@ public class TileKnowledgeBook extends SynchronizedTileEntity AspectList workResearchList = new AspectList(); for (Aspect a : researchTags.aspects.keySet()) { int value = researchTags.aspects.get(a); - int newVal = (int) Math - .max(TileKnowledgeBook.LOWEST_AMOUNT, ((double) value) * TileKnowledgeBook.MULTIPLIER); + int newVal = (int) (value * TileKnowledgeBook.MULTIPLIER * researchComplexity + (researchWarp ^ 2)); workResearchList.add(a, newVal); } this.workResearchAspects = workResearchList; diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java index 56b75d2..03e85f2 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java @@ -50,9 +50,11 @@ public class IntegrationAutomagy extends IntegrationMod { // Better bookshelves -> MOAR knowledge Block betterBookshelf = Block.getBlockFromName("Automagy:blockBookshelfEnchanted"); + Block testBookshelf = Block.getBlockFromName("Thaumcraft:blockCosmeticSolid"); if (betterBookshelf != null) { TileKnowledgeBook.knowledgeIncreaseMap.put(new TileKnowledgeBook.BlockSnapshot(betterBookshelf, 0), 2); TileKnowledgeBook.knowledgeIncreaseMap.put(new TileKnowledgeBook.BlockSnapshot(betterBookshelf, 1), 4); + TileKnowledgeBook.knowledgeIncreaseMap.put(new TileKnowledgeBook.BlockSnapshot(testBookshelf, 4), 20); } }