Skip to content

Commit c377444

Browse files
committed
Add more expansive support for EMI's alias system
1 parent 954201a commit c377444

File tree

60 files changed

+2304
-96
lines changed

Some content is hidden

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

60 files changed

+2304
-96
lines changed

build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,15 @@ dependencies {
439439
}
440440

441441
compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
442-
442+
def emi = "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
443+
//TODO - 1.20.5: Re-evaluate
444+
//Compile against full emi in datagen
445+
datagenMainCompileOnly(emi)
443446
if (recipe_viewer == "emi" || recipe_viewer == "hybrid") {
444-
localRuntime("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}")
447+
localRuntime(emi)
448+
} else {
449+
//We still need it to load in datagen regardless of if we are using emi or a different viewer so that we can access EMI related objects
450+
datagenMainRuntimeOnly(emi)
445451
}
446452

447453
//TODO - 1.19: Re-enable once https://github.com/Chisel-Team/ConnectedTexturesMod/pull/204 is merged

src/datagen/additions/java/mekanism/additions/client/AdditionsLangProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mekanism.additions.client;
22

33
import java.util.Map;
4+
import mekanism.additions.client.integration.AdditionsAliases;
45
import mekanism.additions.common.AdditionsLang;
56
import mekanism.additions.common.AdditionsTags;
67
import mekanism.additions.common.MekanismAdditions;
@@ -31,6 +32,7 @@ protected void addTranslations() {
3132
addSubtitles();
3233
addAdvancements();
3334
addMisc();
35+
addAliases(AdditionsAliases.values());
3436
}
3537

3638
private void addTags() {
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package mekanism.additions.client.integration;
2+
3+
import mekanism.additions.common.MekanismAdditions;
4+
import mekanism.api.annotations.NothingNullByDefault;
5+
import mekanism.client.integration.IAliasedTranslation;
6+
import net.minecraft.Util;
7+
8+
@NothingNullByDefault
9+
public enum AdditionsAliases implements IAliasedTranslation {
10+
GLOW_PANEL_LIGHT_SOURCE("glow_panel.light_source", "Light Source"),
11+
WALKIE_TALKIE_RADIO("walkie_talkie.radio", "Radio"),
12+
PLASTIC_ROAD_PATH("plastic_road.path", "Plastic Path"),
13+
;
14+
15+
private final String key;
16+
private final String alias;
17+
18+
AdditionsAliases(String path, String alias) {
19+
this.key = Util.makeDescriptionId("alias", MekanismAdditions.rl(path));
20+
this.alias = alias;
21+
}
22+
23+
@Override
24+
public String getTranslationKey() {
25+
return key;
26+
}
27+
28+
@Override
29+
public String getAlias() {
30+
return alias;
31+
}
32+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package mekanism.additions.client.integration;
2+
3+
import java.util.concurrent.CompletableFuture;
4+
import mekanism.additions.common.MekanismAdditions;
5+
import mekanism.additions.common.registries.AdditionsBlocks;
6+
import mekanism.additions.common.registries.AdditionsItems;
7+
import mekanism.api.annotations.NothingNullByDefault;
8+
import mekanism.client.integration.emi.BaseEmiAliasProvider;
9+
import net.minecraft.core.HolderLookup;
10+
import net.minecraft.data.PackOutput;
11+
12+
@NothingNullByDefault
13+
public class AdditionsEmiAliasProvider extends BaseEmiAliasProvider {
14+
15+
public AdditionsEmiAliasProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
16+
super(output, registries, MekanismAdditions.MODID);
17+
}
18+
19+
@Override
20+
protected void addAliases(HolderLookup.Provider lookupProvider) {
21+
addAliases(AdditionsItems.WALKIE_TALKIE, AdditionsAliases.WALKIE_TALKIE_RADIO);
22+
addAliases(AdditionsBlocks.GLOW_PANELS.values(), AdditionsAliases.GLOW_PANEL_LIGHT_SOURCE);
23+
addAliases(AdditionsBlocks.PLASTIC_ROADS.values(), AdditionsAliases.PLASTIC_ROAD_PATH);
24+
}
25+
}

src/datagen/additions/java/mekanism/additions/common/AdditionsDataGenerator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.concurrent.CompletableFuture;
44
import mekanism.additions.client.AdditionsBlockStateProvider;
5+
import mekanism.additions.client.integration.AdditionsEmiAliasProvider;
56
import mekanism.additions.client.AdditionsItemModelProvider;
67
import mekanism.additions.client.AdditionsLangProvider;
78
import mekanism.additions.client.AdditionsSoundProvider;
@@ -39,6 +40,7 @@ public static void gatherData(GatherDataEvent event) {
3940
gen.addProvider(event.includeClient(), new AdditionsSpriteSourceProvider(output, existingFileHelper, lookupProvider));
4041
gen.addProvider(event.includeClient(), new AdditionsItemModelProvider(output, existingFileHelper));
4142
gen.addProvider(event.includeClient(), new AdditionsBlockStateProvider(output, existingFileHelper));
43+
gen.addProvider(event.includeClient(), new AdditionsEmiAliasProvider(output, lookupProvider));
4244
//Server side data generators
4345
gen.addProvider(event.includeServer(), new AdditionsTagProvider(output, lookupProvider, existingFileHelper));
4446
gen.addProvider(event.includeServer(), new AdditionsLootProvider(output, lookupProvider));

src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/.cache/c2007283a832f570d2167eeffdb50ecb2f811654

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)