From c0092a3a4978c478a7cf70e424b46ee4dc73f8a5 Mon Sep 17 00:00:00 2001 From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com> Date: Sat, 8 Apr 2023 17:30:46 +1000 Subject: [PATCH] Add GT Drawers (#305) https://github.com/Nomi-CEu/gregtech-drawers https://www.curseforge.com/minecraft/mc-mods/gregtech-drawers Fixes #238. This will be merged once gt 2.6 is out. /* Commits: */ * Add GT drawer stuff to TOP config + Hand Framing Tool * Oops * Add GT Drawers mod (v1.0.2) --- manifest.json | 5 +++++ overrides/config/theoneprobe.cfg | 3 ++- overrides/scripts/HandFramingTool.zs | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 42640b0..6c62240 100644 --- a/manifest.json +++ b/manifest.json @@ -773,6 +773,11 @@ "projectID": 737252, "fileID": 4278838, "required": true + }, + { + "projectID": 845779, + "fileID": 4477224, + "required": true } ] } diff --git a/overrides/config/theoneprobe.cfg b/overrides/config/theoneprobe.cfg index e25c87c..807ea2f 100644 --- a/overrides/config/theoneprobe.cfg +++ b/overrides/config/theoneprobe.cfg @@ -119,7 +119,6 @@ providers { gregtech:workable_provider thermalexpansion.topplugin enderio:default - simplefluidtanks:TankInfoProvider > } @@ -194,6 +193,8 @@ theoneprobe { storagedrawers:compdrawers storagedrawers:customdrawers framedcompactdrawers:framed_compact_drawer + gregtechdrawers:basicdrawers_gregtech_rubber_wood + gregtechdrawers:basicdrawers_gregtech_treated_wood > # Show the growth level of crops (0 = not, 1 = always, 2 = sneak) [range: 0 ~ 2, default: 1] diff --git a/overrides/scripts/HandFramingTool.zs b/overrides/scripts/HandFramingTool.zs index 77fcca0..cf66c82 100644 --- a/overrides/scripts/HandFramingTool.zs +++ b/overrides/scripts/HandFramingTool.zs @@ -28,7 +28,9 @@ function isFrameable(block as IBlockDefinition) as bool { || block.id == "storagedrawers:compdrawers" || block.id == "storagedrawers:controller" - || block.id == "storagedrawers:controllerslave"; + || block.id == "storagedrawers:controllerslave" + + || block.id.startsWith("gregtechdrawers"); } function isReframing(block as IBlockDefinition) as bool { @@ -47,7 +49,7 @@ function makeFramedState(state as IBlockState) as IBlockState { if id == "storagedrawers:trim" { return .block.definition.defaultState; } - return (id == "storagedrawers:basicdrawers" ? : + return (id == "storagedrawers:basicdrawers" || id.startsWith("gregtechdrawers") ? : id == "storagedrawers:compdrawers" ? : id == "storagedrawers:controllerslave" ? : )