Skip to content

Commit 595a9e4

Browse files
ko-ljako-lja
committed
datagen + misc lang etc rework + giga pattern provider(and upgrades)
Signed-off-by: Kolja <contact@kolja.lu>
1 parent 620a0a8 commit 595a9e4

81 files changed

Lines changed: 1087 additions & 732 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pluginManagement {
22
repositories {
3+
mavenLocal()
34
gradlePluginPortal() // Needed for spotless
45
maven { url = 'https://maven.minecraftforge.net/' }
56
maven { url = 'https://maven.parchmentmc.org' }

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"group.ex_pattern_provider.name": "ME Extended Pattern Provider",
3131
"group.exp_io_port.name": "ME Expanded IO Port",
3232
"group.exp_pattern_provider.name": "ME Expanded Pattern Provider",
33+
"group.giga_pattern_provider.name": "ME Giga Pattern Provider",
3334
"group.interface.name": "ME Interface",
3435
"group.mega_pattern_provider.name": "ME MEGA Pattern Provider",
3536
"group.mod_storage_bus.name": "ME Mod Storage Bus",
@@ -43,6 +44,10 @@
4344
"gui.buttons.pattern.mult": "§bx%d§f",
4445
"gui.buttons.tooltips.pattern.div": "Divides contents by §b%d§f",
4546
"gui.buttons.tooltips.pattern.mult": "Multiplies contents by §c%d§f",
47+
"gui.expandedae.blocking_mode": "Blocking Mode - %s",
48+
"gui.expandedae.blocking_mode.Default": "Default",
49+
"gui.expandedae.blocking_mode.Full": "Full",
50+
"gui.expandedae.blocking_mode.Smart": "Smart",
4651
"gui.expandedae.blocking_mode.all": "Blocks if target contains anything",
4752
"gui.expandedae.blocking_mode.default": "Default blocking mode",
4853
"gui.expandedae.blocking_mode.smart": "Allows same pattern to be pushed",
@@ -54,8 +59,8 @@
5459
"gui.expandedae.exp_io_port": "Expanded IO Port",
5560
"gui.expandedae.exp_pattern_provider": "Expanded Pattern Provider",
5661
"gui.expandedae.filter_terminal": "Filter Terminal",
62+
"gui.expandedae.giga_pattern_provider": "Giga Pattern Provider",
5763
"gui.expandedae.highlight": "Shift-Click to highlight",
58-
"gui.expandedae.linked_terminal.hint": "§c§lNote: This will only pull blocks from your ME network, not your inventory",
5964
"gui.expandedae.shift_info": "§7Press §o[SHIFT] §r§7for more info",
6065
"gui.expandedae.switch_page": "%s Page",
6166
"gui.expandedae.switch_page.hint": "Click to go to the %s page",
@@ -83,15 +88,19 @@
8388
"item.expandedae.dual_storage_cell_4m": "4m ME Dual Storage Cell",
8489
"item.expandedae.dual_storage_cell_64k": "64k ME Dual Storage Cell",
8590
"item.expandedae.dual_storage_cell_64m": "64m ME Dual Storage Cell",
91+
"item.expandedae.exp2g_pattern_provider_upgrade": "Expanded2Giga Pattern Provider Upgrade",
8692
"item.expandedae.exp_pattern_provider_part": "Expanded Pattern Provider",
8793
"item.expandedae.exp_pattern_provider_upgrade": "Expanded Pattern Provider Upgrade",
94+
"item.expandedae.ext2g_pattern_provider_upgrade": "Extended2Giga Pattern Provider Upgrade",
8895
"item.expandedae.ext_pattern_provider_upgrade": "Extended Pattern Provider Upgrade",
96+
"item.expandedae.giga_pattern_provider_part": "Giga Pattern Provider",
8997
"item.expandedae.greater_accel_card": "Greater Acceleration Card",
9098
"item.expandedae.greater_accel_card.tooltip.1": "Even greater acceleration",
9199
"item.expandedae.greater_accel_card.tooltip.2": "Note: Very power hungry!",
92-
"item.expandedae.linked_terminal": "Linked Terminal",
100+
"item.expandedae.m2g_pattern_provider_upgrade": "Mega2Giga Pattern Provider Upgrade",
93101
"item.expandedae.mega_dual_cell_housing": "ME MEGA Dual Cell Housing",
94102
"item.expandedae.mega_pattern_provider_upgrade": "Mega Pattern Provider Upgrade",
103+
"item.expandedae.p2g_pattern_provider_upgrade": "Giga Pattern Provider Upgrade",
95104
"item.expandedae.pattern_refiller_card": "Pattern Refiller Card",
96105
"item.expandedae.pattern_refiller_card.tooltip.1": "Automatically refills the blank patterns",
97106
"item.expandedae.priority_card": "Priority Card",
@@ -100,9 +109,13 @@
100109
"item.expandedae.priority_card.hint.3": "Right-click the air to toggle the mode",
101110
"item.expandedae.upgrade.tooltip": "Upgrade %s",
102111
"itemGroup.eae": "Expanded AE",
103-
"msg.expandedae.bound_to": "Bound to %s",
112+
"key.categories.expandedae": "Expanded AE",
113+
"key.expandedae.highlight": "Highlight Stored Locations",
104114
"msg.expandedae.highlighted": "Highlighted block at %s §rin %s",
115+
"msg.expandedae.highlighting_blocks": "Highlighting storage locations for %s",
116+
"msg.expandedae.highlighting_crafts": "Highlighting crafting locations for %s",
105117
"msg.expandedae.mode_changed": "Changed mode to %s",
118+
"msg.expandedae.no_highlighted_blocks": "Found nothing to highlight",
106119
"msg.expandedae.prio_changed": "Set priority of %s to %s",
107120
"msg.expandedae.prio_reset": "Reset priority to %s",
108121
"text.expandedae.card": "Current: %s"

‎src/generated/resources/assets/expandedae/models/item/exp2g_pattern_provider_upgrade.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "expandedae:item/exp2g_pattern_provider_upgrade"
5+
}
6+
}

‎src/generated/resources/assets/expandedae/models/item/ext2g_pattern_provider_upgrade.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "expandedae:item/ext2g_pattern_provider_upgrade"
5+
}
6+
}

src/generated/resources/assets/expandedae/models/item/linked_terminal.json renamed to src/generated/resources/assets/expandedae/models/item/m2g_pattern_provider_upgrade.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:item/generated",
33
"textures": {
4-
"layer0": "expandedae:item/linked_terminal"
4+
"layer0": "expandedae:item/m2g_pattern_provider_upgrade"
55
}
66
}

‎src/generated/resources/assets/expandedae/models/item/p2g_pattern_provider_upgrade.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "expandedae:item/p2g_pattern_provider_upgrade"
5+
}
6+
}

‎src/generated/resources/data/expandedae/advancements/recipes/misc/crafting/giga_pattern_provider.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_engineering_processor": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"ae2:engineering_processor"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "expandedae:crafting/giga_pattern_provider"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_engineering_processor",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"expandedae:crafting/giga_pattern_provider"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/expandedae/advancements/recipes/misc/crafting/giga_pattern_provider_alt.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_giga_pattern_provider_part": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"expandedae:giga_pattern_provider_part"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "expandedae:crafting/giga_pattern_provider_alt"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_giga_pattern_provider_part",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"expandedae:crafting/giga_pattern_provider_alt"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/expandedae/advancements/recipes/misc/crafting/giga_pattern_provider_part.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_giga_pattern_provider": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"expandedae:giga_pattern_provider"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "expandedae:crafting/giga_pattern_provider_part"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_giga_pattern_provider",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"expandedae:crafting/giga_pattern_provider_part"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/expandedae/recipes/crafting/giga_pattern_provider.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"E": {
6+
"item": "ae2:engineering_processor"
7+
},
8+
"P": {
9+
"item": "expandedae:exp_pattern_provider"
10+
}
11+
},
12+
"pattern": [
13+
"EPE",
14+
"P P",
15+
"EPE"
16+
],
17+
"result": {
18+
"item": "expandedae:giga_pattern_provider"
19+
},
20+
"show_notification": true
21+
}

0 commit comments

Comments
 (0)