From 89fc1c8ce75ffb8293bc6e1bfbfaf92300a1a53d Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Mon, 17 Feb 2014 00:40:46 +0100 Subject: [PATCH] Added secret room module. Added lookup by TileEntity for override stack to the Raytracing routine. --- assets/waila/lang/en_US.lang | 3 +- .../addons/secretrooms/HUDTileEntityCamo.java | 44 +++++++++++++++++++ .../addons/secretrooms/SecretRoomsModule.java | 38 ++++++++++++++++ mcp/mobius/waila/client/ProxyClient.java | 4 ++ mcp/mobius/waila/overlay/RayTracing.java | 12 ++++- 5 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java create mode 100644 mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java diff --git a/assets/waila/lang/en_US.lang b/assets/waila/lang/en_US.lang index 0c2eb4c..1ff36e5 100644 --- a/assets/waila/lang/en_US.lang +++ b/assets/waila/lang/en_US.lang @@ -135,4 +135,5 @@ option.pr.showio=Show gates IO option.pr.showdata=Show gates data option.extrautilities.fluidamount=Show fluid amount option.openblocks.fluidamount=Show fluid amount -option.railcraft.fluidamount=Show fluid amount \ No newline at end of file +option.railcraft.fluidamount=Show fluid amount +option.secretrooms.hide=Hide camo blocks \ No newline at end of file diff --git a/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java new file mode 100644 index 0000000..712cfb8 --- /dev/null +++ b/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -0,0 +1,44 @@ +package mcp.mobius.waila.addons.secretrooms; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDTileEntityCamo implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + + if (config.getConfig("secretrooms.hide")){ + NBTTagCompound tag = accessor.getNBTData(); + + if (tag.hasKey("copyID") && tag.hasKey("copyMeta")){ + int copyID = accessor.getNBTInteger(tag, "copyID"); + int copyMeta = accessor.getNBTInteger(tag, "copyMeta"); + return new ItemStack(copyID, 1, copyMeta); + } + } + + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java b/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java new file mode 100644 index 0000000..2db8713 --- /dev/null +++ b/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java @@ -0,0 +1,38 @@ +package mcp.mobius.waila.addons.secretrooms; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class SecretRoomsModule { + + public static Class TileEntityCamo = null; + + + public static void register(){ + try{ + Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms"); + Waila.log.log(Level.INFO, "SecretRooms mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[SecretRooms] SecretRooms mod not found."); + return; + } + + try{ + TileEntityCamo = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.TileEntityCamo"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[SecretRooms] Class not found. " + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARNING, "[SecretRooms] Error while loading module. " + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("SecretRooms", "secretrooms.hide"); + ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), TileEntityCamo); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCamo); + } + +} diff --git a/mcp/mobius/waila/client/ProxyClient.java b/mcp/mobius/waila/client/ProxyClient.java index 15a7e0e..af3b506 100644 --- a/mcp/mobius/waila/client/ProxyClient.java +++ b/mcp/mobius/waila/client/ProxyClient.java @@ -12,6 +12,7 @@ import mcp.mobius.waila.addons.ic2.IC2Module; import mcp.mobius.waila.addons.openblocks.OpenBlocksModule; import mcp.mobius.waila.addons.projectred.ProjectRedModule; import mcp.mobius.waila.addons.railcraft.RailcraftModule; +import mcp.mobius.waila.addons.secretrooms.SecretRoomsModule; import mcp.mobius.waila.addons.stevescarts.StevesCartsModule; import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule; @@ -135,6 +136,9 @@ public class ProxyClient extends ProxyServer { /* Steve's Carts */ StevesCartsModule.register(); + + /* Secret Rooms */ + SecretRoomsModule.register(); } @Override diff --git a/mcp/mobius/waila/overlay/RayTracing.java b/mcp/mobius/waila/overlay/RayTracing.java index 0a6ec9f..dd5f757 100644 --- a/mcp/mobius/waila/overlay/RayTracing.java +++ b/mcp/mobius/waila/overlay/RayTracing.java @@ -16,6 +16,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumMovingObjectType; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -133,8 +134,9 @@ public class RayTracing { int x = this.target.blockX; int y = this.target.blockY; int z = this.target.blockZ; - int blockID = world.getBlockId(x, y, z); - Block mouseoverBlock = Block.blocksList[blockID]; + int blockID = world.getBlockId(x, y, z); + Block mouseoverBlock = Block.blocksList[blockID]; + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); if (mouseoverBlock == null) return items; if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock)){ @@ -143,6 +145,12 @@ public class RayTracing { items.add(providerStack); } + if (tileEntity != null && ModuleRegistrar.instance().hasStackProviders(tileEntity)){ + ItemStack providerStack = ModuleRegistrar.instance().getStackProviders(tileEntity).get(0).getWailaStack(DataAccessorBlock.instance, ConfigHandler.instance()); + if (providerStack != null) + items.add(providerStack); + } + if(items.size() > 0) return items;