diff options
| -rw-r--r-- | dependencies.gradle | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_Client.java | 16 |
2 files changed, 22 insertions, 8 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 7bcc1b23aa..881cc7a6d2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,29 +36,29 @@ dependencies { api("com.github.GTNewHorizons:StructureLib:1.2.7:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - api("com.github.GTNewHorizons:NotEnoughItems:2.3.54-GTNH:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.3.55-GTNH:dev") api("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") api("com.github.GTNewHorizons:ModularUI:1.1.12:dev") api("com.github.GTNewHorizons:waila:1.6.0:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-217-GTNH:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-228-GTNH:dev") implementation("com.github.GTNewHorizons:Eternal-Singularity:1.1.0:dev") compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.2.10:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.33:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.34:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.4.18:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.6.7:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.14.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:EnderCore:0.2.14:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.0.69-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:EnderCore:0.2.16:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.0.71-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.36-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Chisel:2.11.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.11.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.1.2.21:dev") { transitive = false } compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false } compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.4.19:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.17:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.18:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:Botania:1.9.23-GTNH:dev') { transitive = false } compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false } diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 38ed683523..92d3300ed2 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -59,9 +59,11 @@ import gregtech.api.enums.SoundResource; import gregtech.api.gui.GT_GUIColorOverride; import gregtech.api.gui.modularui.FallbackableSteamTexture; import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.ITurnable; import gregtech.api.items.GT_MetaGenerated_Item; import gregtech.api.metatileentity.BaseMetaPipeEntity; +import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.multitileentity.multiblock.base.MultiBlockPart; import gregtech.api.net.GT_Packet_ClientPreference; import gregtech.api.objects.GT_ItemStack; @@ -75,6 +77,7 @@ import gregtech.api.util.GT_PlayedSound; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.WorldSpawnedEventBuilder; +import gregtech.common.blocks.GT_Item_Machines; import gregtech.common.entities.GT_Entity_Arrow; import gregtech.common.entities.GT_Entity_Arrow_Potion; import gregtech.common.render.GT_CapeRenderer; @@ -757,6 +760,14 @@ public class GT_Client extends GT_Proxy implements Runnable { if (!(aTileEntity instanceof ICoverable)) return; + if (aEvent.player.isSneaking() && aTileEntity instanceof IGregTechTileEntity gtEntity + && gtEntity.getMetaTileEntity() instanceof MetaPipeEntity) { + if (aEvent.currentItem != null && aEvent.currentItem.getItem() instanceof GT_Item_Machines + && GregTech_API.METATILEENTITIES[aEvent.currentItem.getItemDamage()] instanceof MetaPipeEntity) { + drawGrid(aEvent, false, false, false); + } + } + if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList) || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList) || (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSoftHammerList) @@ -994,7 +1005,10 @@ public class GT_Client extends GT_Proxy implements Runnable { || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList) || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList) || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList) - || GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))) { + || GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem)) + || (tCurrentItem.getItem() instanceof GT_Item_Machines + && GregTech_API.METATILEENTITIES[tCurrentItem.getItemDamage()] instanceof MetaPipeEntity + && player.isSneaking())) { hide |= 0x2; } return hide; |