Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monitor feature #650

Draft
wants to merge 5 commits into
base: dev/0.8
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,11 @@ dependencies {
compileOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
compileOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
// IMPORTANT. This should be removed/commented when running `runData`
runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
// runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
// runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
// runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
// runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
// runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")

// Patchouli
compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
Expand All @@ -331,8 +331,8 @@ dependencies {
// DimStorage
compileOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
compileOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")
runtimeOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
runtimeOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")
// runtimeOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
// runtimeOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")

//Powah
compileOnly fg.deobf("curse.maven:powah-633483:${powah_version}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
// 1.19.2 2024-05-28T14:53:16.656615 LootTables
d865e8ac35302c486faf5c7122569c554186186d data/advancedperipherals/loot_tables/blocks/block_reader.json
a6f896cc3dbd8da12737825ec71e32970f54025c data/advancedperipherals/loot_tables/blocks/chat_box.json
f50f506ae1987537f76be4c05a81689b25798f91 data/advancedperipherals/loot_tables/blocks/colony_integrator.json
4dcad851450e4ddd8d28a0017a417bf6e5579bda data/advancedperipherals/loot_tables/blocks/distance_detector.json
1d1b858d09538dc66bab2c33a2f9c58361a9c472 data/advancedperipherals/loot_tables/blocks/energy_detector.json
317004b1358ef9bf83957d2d6796529a226161c7 data/advancedperipherals/loot_tables/blocks/environment_detector.json
df6186990887f77b7db37ebb8ee50a7e7f096b0a data/advancedperipherals/loot_tables/blocks/fluid_detector.json
cea5a036d4ccdcc6ef026d1a226b5e13f1060676 data/advancedperipherals/loot_tables/blocks/gas_detector.json
d5a3964f518b138cbd7305c819a36af3d9340e4a data/advancedperipherals/loot_tables/blocks/geo_scanner.json
8aa1deea908fd02f049e047c8ca16679bbef68a2 data/advancedperipherals/loot_tables/blocks/inventory_manager.json
9a2898a63e2e0c087ce8eba211c63d1c8b9fd4aa data/advancedperipherals/loot_tables/blocks/me_bridge.json
973770040bacb61482adb9739fd1d977f16c107f data/advancedperipherals/loot_tables/blocks/nbt_storage.json
b4b80e8c9d62b53d9252cdfc5918c077d3a01f6e data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
58b6adbea5d4ae43ed9af0b627df2b8a4907acde data/advancedperipherals/loot_tables/blocks/player_detector.json
a58aebcc52684302968e7af4f50a12aff93aaf2d data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
0ef1678f88b8fcb744bfd95261f66745340be8f4 data/advancedperipherals/loot_tables/blocks/rs_bridge.json
// 1.19.2 2024-07-22T18:12:14.617845 LootTables
618b63c020ab64890c8a2d2506dd61cd30259a44 data/advancedperipherals/loot_tables/blocks/block_reader.json
0923665563d05307a7fa7d711a2d7a994a31eb6e data/advancedperipherals/loot_tables/blocks/chat_box.json
bf2a80256cfba0bd8c0283d493882e5816882f1f data/advancedperipherals/loot_tables/blocks/colony_integrator.json
cff4b81aa381bc0d1172b0a4c8bb35c1b954a018 data/advancedperipherals/loot_tables/blocks/distance_detector.json
1c5dbe1a8e07e040a3c2893a002cd535ee41dc20 data/advancedperipherals/loot_tables/blocks/energy_detector.json
8cc03eca1d191f725bc558836f26a85a466cb127 data/advancedperipherals/loot_tables/blocks/environment_detector.json
12589e7642b383029457d97a64637494ea8507a3 data/advancedperipherals/loot_tables/blocks/fluid_detector.json
421a3ece56485bd46374844639bfd606ce4665ec data/advancedperipherals/loot_tables/blocks/gas_detector.json
a2ae352dce564b878daecf47026f268dd432fbcf data/advancedperipherals/loot_tables/blocks/geo_scanner.json
807d449d02c0af701f84d3e806ebac20d3a1f91c data/advancedperipherals/loot_tables/blocks/inventory_manager.json
bb9b442dfad1d5f31397585c8394c85243fa169a data/advancedperipherals/loot_tables/blocks/me_bridge.json
52b1fe2e265be456ebf48d7e0d9ebcc8c994176f data/advancedperipherals/loot_tables/blocks/nbt_storage.json
2651e6053857a31f5bccc360969924848a197ad5 data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
6b5058b6bc49689bf2b858b89f3981a4bb681750 data/advancedperipherals/loot_tables/blocks/player_detector.json
6af6542c7b64aa22dbfcdb01299daf4911827a49 data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
b221c6a82da0875264a112b54f847ac6a1f36797 data/advancedperipherals/loot_tables/blocks/rs_bridge.json
e4e12e83f3fe31e9d7e751ebed1d68787af737c9 data/advancedperipherals/loot_tables/blocks/ultimate_monitor.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-05-28T14:53:16.658228 Block States: advancedperipherals
// 1.19.2 2024-07-22T22:10:50.227118 Block States: advancedperipherals
5e28ce1be9a6996d982641e5df1fa7162090b8cc assets/advancedperipherals/blockstates/block_reader.json
f42bdde60f84fdb312f7cf3b2be461d9c11ebdc8 assets/advancedperipherals/blockstates/chat_box.json
1227aa092fcf1327547ace6ccc9db230e45891b0 assets/advancedperipherals/blockstates/colony_integrator.json
Expand All @@ -15,6 +15,7 @@ d1fe6188b0b0ce8779cb9795a746177858cbaa41 assets/advancedperipherals/blockstates/
ff12c7217911184266589813a2c8f9b0d46cfd65 assets/advancedperipherals/blockstates/player_detector.json
726cf2599b0c765bcfacda88a1943be74f985877 assets/advancedperipherals/blockstates/redstone_integrator.json
6b176e8fdb048f7b6678bfbc1c4baf2bcfa67a1f assets/advancedperipherals/blockstates/rs_bridge.json
4b72ba2f7dfee76e138eea29f0b76c856456afca assets/advancedperipherals/blockstates/ultimate_monitor.json
544ff1ecb58622350b58940036b4b1908e1146da assets/advancedperipherals/models/block/block_reader.json
fbaa69d6c98549d3f2d4a1c7bebd9b6b80d56621 assets/advancedperipherals/models/block/chat_box.json
68f9d37bd85649937150ba0bb8f4496bb2ef218d assets/advancedperipherals/models/block/colony_integrator.json
Expand All @@ -31,3 +32,21 @@ f6cb0dda1ce8217563903d2dfaf5ef0297939750 assets/advancedperipherals/models/block
5a1679b4dcc8da2d8c67674216d242456bb51366 assets/advancedperipherals/models/block/player_detector.json
d08b8946e1eb01cc9c8af4fa297b582614d1034b assets/advancedperipherals/models/block/redstone_integrator.json
41cf7d22016a995aeda9df9d9cbf1d4069b99f9e assets/advancedperipherals/models/block/rs_bridge.json
4d1d80c69bca9055b4cbb887f43ee6fce944d46f assets/advancedperipherals/models/block/ultimate_monitor.json
cce2709f323a71a029523533d7225dd6062b1243 assets/advancedperipherals/models/block/ultimate_monitor_d.json
db96f3c5231c785b10b37457ca104337c34acf7a assets/advancedperipherals/models/block/ultimate_monitor_item.json
1d704566dcc73c0a471a60c17e1139859f6b4087 assets/advancedperipherals/models/block/ultimate_monitor_l.json
03a49d3bebc2538c1bdbb21fc5bd3b96fe4e5be7 assets/advancedperipherals/models/block/ultimate_monitor_ld.json
987050c372fc907ae6dc9d759e693572da0d919a assets/advancedperipherals/models/block/ultimate_monitor_lr.json
1a13dca8e31d9b27f9391ed34fefa4dd1493d4cb assets/advancedperipherals/models/block/ultimate_monitor_lrd.json
9001072a7c861839313cf3e43b2628aad9a475ed assets/advancedperipherals/models/block/ultimate_monitor_lru.json
4d864eefd1a7522f5d0a73bcc35cf6557b2c421c assets/advancedperipherals/models/block/ultimate_monitor_lrud.json
82c5b1847ced8a2a2b9dd431e7a604fc03861bad assets/advancedperipherals/models/block/ultimate_monitor_lu.json
6ff46ed73c890105f2b24de9011e130658753ee1 assets/advancedperipherals/models/block/ultimate_monitor_lud.json
dbcfbec0493edfd68c64f7b0cf49157b1fded7e9 assets/advancedperipherals/models/block/ultimate_monitor_r.json
c0d0a974d391e336691058e09cb0f49c29a48c5f assets/advancedperipherals/models/block/ultimate_monitor_rd.json
63686a2dc96294e37d3129f0bb196caa77079712 assets/advancedperipherals/models/block/ultimate_monitor_ru.json
9116783ed78d59bccbf1333194ce1d633abe85d7 assets/advancedperipherals/models/block/ultimate_monitor_rud.json
c4752b33dfed1cce0d20c10ddd8250dd01fd7b3e assets/advancedperipherals/models/block/ultimate_monitor_u.json
14433cf178dc4e4c2e706f11704ef7aae46f3ae4 assets/advancedperipherals/models/block/ultimate_monitor_ud.json
fc1b1b273f7c7f9280402df88b0f8e31963f8978 assets/advancedperipherals/models/item/ultimate_monitor.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-05-28T14:53:16.658014 Languages: en_us
2580077212426421e05822910bde2edff88e2346 assets/advancedperipherals/lang/en_us.json
// 1.19.2 2024-07-22T18:16:05.152428 Languages: en_us
b6442b87d0f767417402f3a7c3e32438286f9ed4 assets/advancedperipherals/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// 1.19.2 2024-05-28T14:53:16.656337 Block tags
// 1.19.2 2024-07-22T18:12:14.620084 Block tags
cf893e68a6390f614a4c2c2e22f421f452754a81 data/computercraft/tags/blocks/monitor.json
cf893e68a6390f614a4c2c2e22f421f452754a81 data/forge/tags/blocks/needs_gold_tool.json
e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/forge/tags/blocks/needs_wood_tool.json
ef4684e10e5054e8cfd515dffa4a98169d281078 data/minecraft/tags/blocks/mineable/pickaxe.json
3816f0e77b104dc7cb9a3f5ac6e5c58ae645f13f data/minecraft/tags/blocks/mineable/pickaxe.json
8de9358ffeaa8d5f015774f70244a93b915427b8 data/minecraft/tags/blocks/needs_iron_tool.json
Loading
Loading