Skip to content

Commit c278a24

Browse files
authored
Add assembler better yield tooltip to gears (#1059)
1 parent 4423553 commit c278a24

File tree

3 files changed

+105
-0
lines changed

3 files changed

+105
-0
lines changed

src/generated/resources/data/modern_industrialization/data_maps/item/item_tooltips.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
{
22
"values": {
3+
"modern_industrialization:aluminum_gear": {
4+
"components": [
5+
{
6+
"color": "#A9A9A9",
7+
"italic": false,
8+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
9+
}
10+
]
11+
},
12+
"modern_industrialization:bronze_gear": {
13+
"components": [
14+
{
15+
"color": "#A9A9A9",
16+
"italic": false,
17+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
18+
}
19+
]
20+
},
321
"modern_industrialization:capacitor": {
422
"components": [
523
{
@@ -9,6 +27,24 @@
927
}
1028
]
1129
},
30+
"modern_industrialization:copper_gear": {
31+
"components": [
32+
{
33+
"color": "#A9A9A9",
34+
"italic": false,
35+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
36+
}
37+
]
38+
},
39+
"modern_industrialization:gold_gear": {
40+
"components": [
41+
{
42+
"color": "#A9A9A9",
43+
"italic": false,
44+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
45+
}
46+
]
47+
},
1248
"modern_industrialization:inductor": {
1349
"components": [
1450
{
@@ -18,6 +54,24 @@
1854
}
1955
]
2056
},
57+
"modern_industrialization:invar_gear": {
58+
"components": [
59+
{
60+
"color": "#A9A9A9",
61+
"italic": false,
62+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
63+
}
64+
]
65+
},
66+
"modern_industrialization:iron_gear": {
67+
"components": [
68+
{
69+
"color": "#A9A9A9",
70+
"italic": false,
71+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
72+
}
73+
]
74+
},
2175
"modern_industrialization:resistor": {
2276
"components": [
2377
{
@@ -26,6 +80,42 @@
2680
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
2781
}
2882
]
83+
},
84+
"modern_industrialization:stainless_steel_gear": {
85+
"components": [
86+
{
87+
"color": "#A9A9A9",
88+
"italic": false,
89+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
90+
}
91+
]
92+
},
93+
"modern_industrialization:steel_gear": {
94+
"components": [
95+
{
96+
"color": "#A9A9A9",
97+
"italic": false,
98+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
99+
}
100+
]
101+
},
102+
"modern_industrialization:tin_gear": {
103+
"components": [
104+
{
105+
"color": "#A9A9A9",
106+
"italic": false,
107+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
108+
}
109+
]
110+
},
111+
"modern_industrialization:titanium_gear": {
112+
"components": [
113+
{
114+
"color": "#A9A9A9",
115+
"italic": false,
116+
"translate": "text.modern_industrialization.HasBetterYieldAssemblerRecipe"
117+
}
118+
]
29119
}
30120
}
31121
}

src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
import aztech.modern_industrialization.datagen.loot.MILootTables;
3838
import aztech.modern_industrialization.definition.FluidDefinition;
3939
import aztech.modern_industrialization.definition.ItemDefinition;
40+
import aztech.modern_industrialization.materials.MaterialRegistry;
41+
import aztech.modern_industrialization.materials.part.MIParts;
4042
import java.util.List;
4143
import java.util.concurrent.CompletableFuture;
4244
import net.minecraft.core.HolderLookup;
@@ -135,6 +137,13 @@ private void gatherItemTooltips() {
135137
addItemTooltip("capacitor", MIText.HasBetterYieldAssemblerRecipe);
136138
addItemTooltip("inductor", MIText.HasBetterYieldAssemblerRecipe);
137139
addItemTooltip("resistor", MIText.HasBetterYieldAssemblerRecipe);
140+
// Gears get 2x the yield using the assembler.
141+
for (var material : MaterialRegistry.getMaterials().values()) {
142+
var part = material.getNullablePart(MIParts.GEAR);
143+
if (part != null) {
144+
addItemTooltip(part.getItemId().split(":")[1], MIText.HasBetterYieldAssemblerRecipe);
145+
}
146+
}
138147
}
139148

140149
private void addItemTooltip(String path, MIText text) {

src/main/java/aztech/modern_industrialization/materials/Material.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.Map;
3232
import java.util.function.Consumer;
3333
import net.minecraft.data.recipes.RecipeOutput;
34+
import org.jetbrains.annotations.Nullable;
3435

3536
/**
3637
* A read-only material. Build with {@link MaterialBuilder}.
@@ -54,6 +55,11 @@ public Map<PartKey, MaterialItemPart> getParts() {
5455
return Collections.unmodifiableMap(parts);
5556
}
5657

58+
@Nullable
59+
public MaterialItemPart getNullablePart(PartKeyProvider part) {
60+
return parts.get(part.key());
61+
}
62+
5763
public MaterialItemPart getPart(PartKeyProvider part) {
5864
var ret = parts.get(part.key());
5965
if (ret == null) {

0 commit comments

Comments
 (0)