Skip to content

Commit a003661

Browse files
SirEndiiSirEndii
authored
Merge pull request #694 from zyxkad/scientist-patch
scientist patch
2 parents 240a4dd + b5d0686 commit a003661

File tree

20 files changed

+184
-152
lines changed

20 files changed

+184
-152
lines changed

‎build.gradle‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,14 @@ dependencies {
324324
compileOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
325325
compileOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
326326
// IMPORTANT. This should be removed/commented when running `runData`
327-
runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
328-
runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
329-
runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
330-
runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
331-
runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
327+
// Automated now, tho if you are not executing runData directly it's no help
328+
if (!project.gradle.startParameter.taskNames.contains("runData")) {
329+
runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
330+
runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
331+
runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
332+
runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
333+
runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
334+
}
332335

333336
// Patchouli
334337
compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")

‎src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// 1.19.2 2024-05-28T14:53:16.656615 LootTables
2-
d865e8ac35302c486faf5c7122569c554186186d data/advancedperipherals/loot_tables/blocks/block_reader.json
3-
a6f896cc3dbd8da12737825ec71e32970f54025c data/advancedperipherals/loot_tables/blocks/chat_box.json
4-
f50f506ae1987537f76be4c05a81689b25798f91 data/advancedperipherals/loot_tables/blocks/colony_integrator.json
5-
4dcad851450e4ddd8d28a0017a417bf6e5579bda data/advancedperipherals/loot_tables/blocks/distance_detector.json
6-
1d1b858d09538dc66bab2c33a2f9c58361a9c472 data/advancedperipherals/loot_tables/blocks/energy_detector.json
7-
317004b1358ef9bf83957d2d6796529a226161c7 data/advancedperipherals/loot_tables/blocks/environment_detector.json
8-
df6186990887f77b7db37ebb8ee50a7e7f096b0a data/advancedperipherals/loot_tables/blocks/fluid_detector.json
9-
cea5a036d4ccdcc6ef026d1a226b5e13f1060676 data/advancedperipherals/loot_tables/blocks/gas_detector.json
10-
d5a3964f518b138cbd7305c819a36af3d9340e4a data/advancedperipherals/loot_tables/blocks/geo_scanner.json
11-
8aa1deea908fd02f049e047c8ca16679bbef68a2 data/advancedperipherals/loot_tables/blocks/inventory_manager.json
12-
9a2898a63e2e0c087ce8eba211c63d1c8b9fd4aa data/advancedperipherals/loot_tables/blocks/me_bridge.json
13-
973770040bacb61482adb9739fd1d977f16c107f data/advancedperipherals/loot_tables/blocks/nbt_storage.json
14-
b4b80e8c9d62b53d9252cdfc5918c077d3a01f6e data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
15-
58b6adbea5d4ae43ed9af0b627df2b8a4907acde data/advancedperipherals/loot_tables/blocks/player_detector.json
16-
a58aebcc52684302968e7af4f50a12aff93aaf2d data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
17-
0ef1678f88b8fcb744bfd95261f66745340be8f4 data/advancedperipherals/loot_tables/blocks/rs_bridge.json
1+
// 1.19.2 2025-01-16T15:46:41.860623 LootTables
2+
618b63c020ab64890c8a2d2506dd61cd30259a44 data/advancedperipherals/loot_tables/blocks/block_reader.json
3+
0923665563d05307a7fa7d711a2d7a994a31eb6e data/advancedperipherals/loot_tables/blocks/chat_box.json
4+
bf2a80256cfba0bd8c0283d493882e5816882f1f data/advancedperipherals/loot_tables/blocks/colony_integrator.json
5+
cff4b81aa381bc0d1172b0a4c8bb35c1b954a018 data/advancedperipherals/loot_tables/blocks/distance_detector.json
6+
1c5dbe1a8e07e040a3c2893a002cd535ee41dc20 data/advancedperipherals/loot_tables/blocks/energy_detector.json
7+
8cc03eca1d191f725bc558836f26a85a466cb127 data/advancedperipherals/loot_tables/blocks/environment_detector.json
8+
12589e7642b383029457d97a64637494ea8507a3 data/advancedperipherals/loot_tables/blocks/fluid_detector.json
9+
421a3ece56485bd46374844639bfd606ce4665ec data/advancedperipherals/loot_tables/blocks/gas_detector.json
10+
a2ae352dce564b878daecf47026f268dd432fbcf data/advancedperipherals/loot_tables/blocks/geo_scanner.json
11+
807d449d02c0af701f84d3e806ebac20d3a1f91c data/advancedperipherals/loot_tables/blocks/inventory_manager.json
12+
bb9b442dfad1d5f31397585c8394c85243fa169a data/advancedperipherals/loot_tables/blocks/me_bridge.json
13+
52b1fe2e265be456ebf48d7e0d9ebcc8c994176f data/advancedperipherals/loot_tables/blocks/nbt_storage.json
14+
2651e6053857a31f5bccc360969924848a197ad5 data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
15+
6b5058b6bc49689bf2b858b89f3981a4bb681750 data/advancedperipherals/loot_tables/blocks/player_detector.json
16+
6af6542c7b64aa22dbfcdb01299daf4911827a49 data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
17+
b221c6a82da0875264a112b54f847ac6a1f36797 data/advancedperipherals/loot_tables/blocks/rs_bridge.json

‎src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2024-05-28T14:53:16.658014 Languages: en_us
2-
2580077212426421e05822910bde2edff88e2346 assets/advancedperipherals/lang/en_us.json
1+
// 1.19.2 2025-01-16T15:59:34.693839 Languages: en_us
2+
d0fe3ab5a88d6b925369860038c76f23d9910143 assets/advancedperipherals/lang/en_us.json

‎src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.656337 Block tags
1+
// 1.19.2 2025-01-16T15:46:41.859383 Block tags
22
e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/forge/tags/blocks/needs_wood_tool.json
3-
ef4684e10e5054e8cfd515dffa4a98169d281078 data/minecraft/tags/blocks/mineable/pickaxe.json
4-
8de9358ffeaa8d5f015774f70244a93b915427b8 data/minecraft/tags/blocks/needs_iron_tool.json
3+
03322cd493601129eaad6ba7c2a6d808023dfac1 data/minecraft/tags/blocks/mineable/pickaxe.json
4+
277fe59db076a3eab3c97080531ad345f8ca5f3d data/minecraft/tags/blocks/needs_iron_tool.json

‎src/generated/resources/assets/advancedperipherals/lang/en_us.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"advancedperipherals.name": "Advanced Peripherals",
33
"advancements.advancedperipherals.base_toolkit": "Gentleman's set!",
44
"advancements.advancedperipherals.base_toolkit.description": "Collect a redstone integrator, inventory manager and energy detector. How did you even play without this?",
5-
"advancements.advancedperipherals.end_automata_core": "End automata core",
5+
"advancements.advancedperipherals.end_automata_core": "End Automata Core",
66
"advancements.advancedperipherals.end_automata_core.description": "If you can code gps-free position location with this, you're a powerful human being",
7-
"advancements.advancedperipherals.husbandry_automata_core": "Husbandry automata core",
7+
"advancements.advancedperipherals.husbandry_automata_core": "Husbandry Automata Core",
88
"advancements.advancedperipherals.husbandry_automata_core.description": "Is this core gluten-free?",
99
"advancements.advancedperipherals.nbt_toolkit": "No secrets",
1010
"advancements.advancedperipherals.nbt_toolkit.description": "Collect a NBT storage and block reader. Now, all the world's secrets are open to you!",
11-
"advancements.advancedperipherals.overpowered_automata_core": "Overpowered automata core",
11+
"advancements.advancedperipherals.overpowered_automata_core": "Overpowered Automata Core",
1212
"advancements.advancedperipherals.overpowered_automata_core.description": "Can you handle so much power?",
1313
"advancements.advancedperipherals.root": "Advanced Peripherals",
1414
"advancements.advancedperipherals.root.description": "Every journey starts with the first block",
1515
"advancements.advancedperipherals.sense_toolkit": "The truth can't hide forever",
1616
"advancements.advancedperipherals.sense_toolkit.description": "Collect a geo scanner and environmental detector. There are no limits for observability!",
17-
"advancements.advancedperipherals.weak_automata_core": "First automata core",
17+
"advancements.advancedperipherals.weak_automata_core": "First Automata Core",
1818
"advancements.advancedperipherals.weak_automata_core.description": "Does the afterlife exist in minecraft?",
1919
"block.advancedperipherals.block_reader": "Block Reader",
2020
"block.advancedperipherals.chat_box": "Chat Box",
@@ -33,7 +33,7 @@
3333
"block.advancedperipherals.redstone_integrator": "Redstone Integrator",
3434
"block.advancedperipherals.rs_bridge": "RS Bridge",
3535
"curios.identifier.glasses": "Glasses",
36-
"entity.minecraft.villager.advancedperipherals.advancedperipherals:computer_scientist": "Computer Scientist",
36+
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
3737
"item.advancedperipherals.chunk_controller": "Chunk Controller",
3838
"item.advancedperipherals.computer_tool": "Computer Tool",
3939
"item.advancedperipherals.end_automata_core": "End Automata Core",
@@ -83,22 +83,22 @@
8383
"pocket.advancedperipherals.geoscanner_pocket": "Geo",
8484
"pocket.advancedperipherals.player_pocket": "Player Detector",
8585
"text.advancedperipherals.added_player": "Added you to the memory card",
86-
"text.advancedperipherals.automata_core_feed_by_player": "You're trying to feed an entity to a soul, but your own body refuses to do this. Maybe something more mechanical can do this?",
86+
"text.advancedperipherals.automata_core.feed_by_player": "You're trying to feed an entity to a soul, but your own body refuses to do this. Maybe something more mechanical can do this?",
8787
"text.advancedperipherals.removed_player": "Cleared the memory card",
88-
"text.advancedperipherals.saddle_turtle_dismount_hint": "Controlling %1$s. Press %2$s and %3$s to dismount.",
88+
"text.advancedperipherals.saddle_turtle.dismount_hint": "Controlling %1$s. Press %2$s and %3$s to dismount.",
8989
"text.advancedperipherals.smart_glasses.modules": "Modules",
9090
"text.advancedperipherals.smart_glasses.peripherals": "Peripherals",
9191
"turtle.advancedperipherals.chatty_turtle": "Chatty",
9292
"turtle.advancedperipherals.chunky_turtle": "Chunky",
9393
"turtle.advancedperipherals.compass_turtle": "Compass",
94-
"turtle.advancedperipherals.end_automata": "End automata",
94+
"turtle.advancedperipherals.end_automata": "End Automata",
9595
"turtle.advancedperipherals.environment_turtle": "Environment",
9696
"turtle.advancedperipherals.geoscanner_turtle": "Geo",
97-
"turtle.advancedperipherals.husbandry_automata": "Husbandry automata",
98-
"turtle.advancedperipherals.overpowered_end_automata": "Overpowered end automata",
99-
"turtle.advancedperipherals.overpowered_husbandry_automata": "Overpowered husbandry automata",
100-
"turtle.advancedperipherals.overpowered_weak_automata": "Overpowered weak automata",
97+
"turtle.advancedperipherals.husbandry_automata": "Husbandry Automata",
98+
"turtle.advancedperipherals.overpowered_end_automata": "Overpowered End Automata",
99+
"turtle.advancedperipherals.overpowered_husbandry_automata": "Overpowered Husbandry Automata",
100+
"turtle.advancedperipherals.overpowered_weak_automata": "Overpowered Weak Automata",
101101
"turtle.advancedperipherals.player_turtle": "Player Detector",
102102
"turtle.advancedperipherals.saddle_turtle": "Saddle",
103-
"turtle.advancedperipherals.weak_automata": "Weak automata"
103+
"turtle.advancedperipherals.weak_automata": "Weak Automata"
104104
}

‎src/generated/resources/data/advancedperipherals/loot_tables/blocks/distance_detector.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"entries": [
1212
{
1313
"type": "minecraft:item",
14+
"functions": [
15+
{
16+
"function": "minecraft:copy_name",
17+
"source": "block_entity"
18+
}
19+
],
1420
"name": "advancedperipherals:distance_detector"
1521
}
1622
],

‎src/generated/resources/data/advancedperipherals/loot_tables/blocks/fluid_detector.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"entries": [
1212
{
1313
"type": "minecraft:item",
14+
"functions": [
15+
{
16+
"function": "minecraft:copy_name",
17+
"source": "block_entity"
18+
}
19+
],
1420
"name": "advancedperipherals:fluid_detector"
1521
}
1622
],

‎src/generated/resources/data/advancedperipherals/loot_tables/blocks/gas_detector.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"entries": [
1212
{
1313
"type": "minecraft:item",
14+
"functions": [
15+
{
16+
"function": "minecraft:copy_name",
17+
"source": "block_entity"
18+
}
19+
],
1420
"name": "advancedperipherals:gas_detector"
1521
}
1622
],

‎src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"values": [
3-
"advancedperipherals:environment_detector",
3+
"advancedperipherals:block_reader",
44
"advancedperipherals:chat_box",
5-
"advancedperipherals:player_detector",
6-
"advancedperipherals:me_bridge",
7-
"advancedperipherals:rs_bridge",
5+
"advancedperipherals:colony_integrator",
6+
"advancedperipherals:distance_detector",
87
"advancedperipherals:energy_detector",
8+
"advancedperipherals:environment_detector",
99
"advancedperipherals:fluid_detector",
1010
"advancedperipherals:gas_detector",
11-
"advancedperipherals:peripheral_casing",
12-
"advancedperipherals:inventory_manager",
13-
"advancedperipherals:redstone_integrator",
14-
"advancedperipherals:block_reader",
1511
"advancedperipherals:geo_scanner",
16-
"advancedperipherals:colony_integrator",
12+
"advancedperipherals:inventory_manager",
13+
"advancedperipherals:me_bridge",
1714
"advancedperipherals:nbt_storage",
18-
"advancedperipherals:distance_detector"
15+
"advancedperipherals:peripheral_casing",
16+
"advancedperipherals:player_detector",
17+
"advancedperipherals:redstone_integrator",
18+
"advancedperipherals:rs_bridge"
1919
]
2020
}

‎src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"values": [
3-
"advancedperipherals:environment_detector",
3+
"advancedperipherals:block_reader",
44
"advancedperipherals:chat_box",
5-
"advancedperipherals:player_detector",
6-
"advancedperipherals:me_bridge",
7-
"advancedperipherals:rs_bridge",
5+
"advancedperipherals:colony_integrator",
6+
"advancedperipherals:distance_detector",
87
"advancedperipherals:energy_detector",
8+
"advancedperipherals:environment_detector",
99
"advancedperipherals:fluid_detector",
1010
"advancedperipherals:gas_detector",
11-
"advancedperipherals:inventory_manager",
12-
"advancedperipherals:redstone_integrator",
13-
"advancedperipherals:block_reader",
1411
"advancedperipherals:geo_scanner",
15-
"advancedperipherals:colony_integrator",
12+
"advancedperipherals:inventory_manager",
13+
"advancedperipherals:me_bridge",
1614
"advancedperipherals:nbt_storage",
17-
"advancedperipherals:distance_detector"
15+
"advancedperipherals:player_detector",
16+
"advancedperipherals:redstone_integrator",
17+
"advancedperipherals:rs_bridge"
1818
]
1919
}

0 commit comments

Comments
 (0)