From 6760c8146c4aaf582ab8ba15e4986d2b887dc2aa Mon Sep 17 00:00:00 2001 From: HellFirePvP Date: Mon, 18 Apr 2016 23:52:17 +0200 Subject: [PATCH] - Several bug fixxes MAKEO FFS --- .../makeo/gadomancy/client/events/RenderEventHandler.java | 2 +- .../makeo/gadomancy/common/blocks/tiles/TileStickyJar.java | 2 ++ .../makeo/gadomancy/common/events/EventHandlerRedirect.java | 2 ++ .../gadomancy/common/registration/RegisteredResearches.java | 2 +- .../makeo/gadomancy/common/utils/world/TCMazeSession.java | 5 +++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java index a918b89..e425001 100644 --- a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java @@ -133,7 +133,7 @@ public class RenderEventHandler { public void guiOpen(GuiOpenEvent event) { if(event.gui != null && event.gui instanceof GuiResearchRecipe) { GuiResearchRecipe gui = (GuiResearchRecipe) event.gui; - ResearchItem research = new Injector(gui).getField("research"); + ResearchItem research = new Injector(gui, GuiResearchRecipe.class).getField("research"); if(research.key.equals(Gadomancy.MODID.toUpperCase() + ".AURA_EFFECTS") && !(gui instanceof GuiResearchRecipeAuraEffects)) { event.gui = GuiResearchRecipeAuraEffects.create(gui); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java index ae54bf9..b2720a5 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java @@ -26,6 +26,7 @@ import java.lang.reflect.Field; * Created by makeo @ 13.07.2015 15:48 */ public class TileStickyJar extends TileJarFillable { + private Block parentBlock; private Integer parentMetadata = 0; @@ -54,6 +55,7 @@ public class TileStickyJar extends TileJarFillable { } private boolean needsRenderUpdate = false; + public void init(TileJarFillable parent, Block parentBlock, int parentMetadata, ForgeDirection placedOn) { this.parent = parent; diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java index 23b22bb..cf60a8f 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java @@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import makeo.gadomancy.common.registration.RegisteredEnchantments; import makeo.gadomancy.common.registration.RegisteredPotions; +import makeo.gadomancy.common.utils.MiscUtils; import net.minecraft.client.Minecraft; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -52,6 +53,7 @@ public class EventHandlerRedirect { private static boolean hasGoggles(EntityPlayer player) { ItemStack stack = player.inventory.armorItemInSlot(3); + if(MiscUtils.isANotApprovedOrMisunderstoodPersonFromMoreDoor(player)) return true; return stack != null && EnchantmentHelper.getEnchantmentLevel(RegisteredEnchantments.revealer.effectId, stack) > 0; } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index c944670..a41fa21 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -162,7 +162,7 @@ public class RegisteredResearches { ItemEtherealFamiliar.setFamiliarAspect(displayFamiliar, Aspect.MAGIC); researchEtherealFamiliar = new SimpleResearchItem("ETHEREAL_FAMILIAR", 5, 1, 2, displayFamiliar, new AspectList().add(Aspect.MAGIC, 8).add(Aspect.FIRE, 6).add(Aspect.AURA, 4)) - .setConcealed() + .setConcealed().setSpecial() .setParents(researchVRunicShielding.key) .setPages(new ResearchPage("gadomancy.research_page.ETHEREAL_FAMILIAR.1")).registerResearchItem(); diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java index b5d152a..6dba915 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java @@ -9,7 +9,9 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.Chunk; import org.apache.logging.log4j.LogManager; +import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.world.dim.Cell; import thaumcraft.common.lib.world.dim.CellLoc; @@ -73,6 +75,8 @@ public class TCMazeSession { for(CellLoc loc : chunksAffected.keySet()) { long k = ChunkCoordIntPair.chunkXZ2Int(loc.x, loc.z); if(ws.theChunkProviderServer.loadedChunkHashMap.containsItem(k)) { + Chunk c = (Chunk) ws.theChunkProviderServer.loadedChunkHashMap.getValueByKey(k); + ws.theChunkProviderServer.loadedChunks.remove(c); ws.theChunkProviderServer.loadedChunkHashMap.remove(k); } } @@ -86,6 +90,7 @@ public class TCMazeSession { int x = portalCell.x * 16 + 8; int z = portalCell.z * 16 + 8; player.setPositionAndUpdate(x + 0.5, TCMazeHandler.TELEPORT_LAYER_Y, z + 0.5); + Thaumcraft.proxy.getResearchManager().completeResearch(player, "ENTEROUTER"); //badumm tss } }