Skip to content

Commit f68e177

Browse files
Jade provider for Omnic Synthesizer. (#27)
* Updating omnic synth lang. * Updating omnic synth lang and adding a Jade provider.
1 parent e0da93d commit f68e177

File tree

6 files changed

+56
-4
lines changed

6 files changed

+56
-4
lines changed

src/generated/resources/assets/monilabs/lang/en_ud.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"block.monilabs.sculk_xp_sensor_hatch": "ɥɔʇɐH ɹosuǝS ԀX ʞןnɔS",
3131
"config.jade.plugin_monilabs.color_info": "oɟuI ɹoןoƆ ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",
3232
"config.jade.plugin_monilabs.microverse_info": "oɟuI ɹoʇɔǝظoɹԀ ǝsɹǝʌoɹɔıW",
33+
"config.jade.plugin_monilabs.omnic_synth_info": "oɟuI ɹǝzısǝɥʇuʎS ɔıuɯO",
3334
"config.jade.plugin_monilabs.sculk_vat_xp_info": "oɟuI ɹǝɟɟnᗺ ԀX ʇɐΛ ʞןnɔS",
3435
"config.monilabs.option.antimatterRandomMaxExclusive": "ǝʌısnןɔxƎxɐWɯopuɐᴚɹǝʇʇɐɯıʇuɐ",
3536
"config.monilabs.option.antimatterRandomMinInclusive": "ǝʌısnןɔuIuıWɯopuɐᴚɹǝʇʇɐɯıʇuɐ",
@@ -105,7 +106,7 @@
105106
"monilabs.menu.packmodeswitcher.displayname": "ǝpoW ʞɔɐԀ ɥɔʇıʍS",
106107
"monilabs.multiblock.duplicate.0": "ǝʇɐɔıןdnp ɐ sı ʞɔoןqıʇןnɯ sıɥ⟘",
107108
"monilabs.multiblock.duplicate.1": "ʇsıxǝ uɐɔ ǝuo ʎןuO",
108-
"monilabs.omnic.current_diversity_points": "%s :sʇuıod ʎʇısɹǝʌıp ʇuǝɹɹnƆ",
109+
"monilabs.omnic.current_diversity_points": "%s :ssǝɹboɹd ɯnıuɯo ʇuǝɹɹnƆ",
109110
"monilabs.prismatic.color_name.azure": "ɹ§ǝɹnzⱯ6§",
110111
"monilabs.prismatic.color_name.blue": "ɹ§ǝnןᗺƖ§",
111112
"monilabs.prismatic.color_name.cyan": "ɹ§uɐʎƆq§",

src/generated/resources/assets/monilabs/lang/en_us.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"block.monilabs.sculk_xp_sensor_hatch": "Sculk XP Sensor Hatch",
3131
"config.jade.plugin_monilabs.color_info": "Prismatic Crucible Color Info",
3232
"config.jade.plugin_monilabs.microverse_info": "Microverse Projector Info",
33+
"config.jade.plugin_monilabs.omnic_synth_info": "Omnic Synthesizer Info",
3334
"config.jade.plugin_monilabs.sculk_vat_xp_info": "Sculk Vat XP Buffer Info",
3435
"config.monilabs.option.antimatterRandomMaxExclusive": "antimatterRandomMaxExclusive",
3536
"config.monilabs.option.antimatterRandomMinInclusive": "antimatterRandomMinInclusive",
@@ -105,7 +106,7 @@
105106
"monilabs.menu.packmodeswitcher.displayname": "Switch Pack Mode",
106107
"monilabs.multiblock.duplicate.0": "This multiblock is a duplicate",
107108
"monilabs.multiblock.duplicate.1": "Only one can exist",
108-
"monilabs.omnic.current_diversity_points": "Current diversity points: %s",
109+
"monilabs.omnic.current_diversity_points": "Current omnium progress: %s",
109110
"monilabs.prismatic.color_name.azure": "§9Azure§r",
110111
"monilabs.prismatic.color_name.blue": "§1Blue§r",
111112
"monilabs.prismatic.color_name.cyan": "§bCyan§r",

src/main/java/net/neganote/monilabs/common/machine/MoniMachines.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public class MoniMachines {
6666
public static @NotNull BiConsumer<IMultiController, List<Component>> currentDiversityPointsInfo() {
6767
return (controller, list) -> {
6868
if (controller instanceof OmnicSynthesizerMachine omnic) {
69-
list.add(Component.translatable("monilabs.omnic.current_diversity_points", omnic.diversityPoints));
69+
list.add(Component.translatable("monilabs.omnic.current_diversity_points", omnic.diversityPoints)
70+
.append(Component.literal("%")));
7071
}
7172
};
7273
}

src/main/java/net/neganote/monilabs/data/lang/MoniLangHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void init(RegistrateLangProvider provider) {
2828
provider.add("monilabs.prismatic.color_name.magenta", "§dMagenta§r");
2929
provider.add("monilabs.prismatic.color_name.pink", "§cPink§r");
3030

31-
provider.add("monilabs.omnic.current_diversity_points", "Current diversity points: %s");
31+
provider.add("monilabs.omnic.current_diversity_points", "Current omnium progress: %s");
3232

3333
provider.add("monilabs.recipe.required_color", "Required Initial Color:\n%s");
3434
provider.add("monilabs.recipe.result_color", "Resulting Color: \n%s");
@@ -185,6 +185,7 @@ public static void init(RegistrateLangProvider provider) {
185185
provider.add("config.jade.plugin_monilabs.color_info", "Prismatic Crucible Color Info");
186186
provider.add("config.jade.plugin_monilabs.microverse_info", "Microverse Projector Info");
187187
provider.add("config.jade.plugin_monilabs.sculk_vat_xp_info", "Sculk Vat XP Buffer Info");
188+
provider.add("config.jade.plugin_monilabs.omnic_synth_info", "Omnic Synthesizer Info");
188189

189190
multiLang(provider, "gtceu.placeholder_info.prismacColor",
190191
"Returns the current color of the Prismatic Crucible.",

src/main/java/net/neganote/monilabs/integration/jade/MoniJadePlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.minecraft.world.level.block.Block;
44
import net.minecraft.world.level.block.entity.BlockEntity;
55
import net.neganote.monilabs.integration.jade.provider.MicroverseInfoBlockProvider;
6+
import net.neganote.monilabs.integration.jade.provider.OmnicSynthProgressProvider;
67
import net.neganote.monilabs.integration.jade.provider.PrismaticColorBlockProvider;
78
import net.neganote.monilabs.integration.jade.provider.SculkVatXPProvider;
89

@@ -20,12 +21,14 @@ public void register(IWailaCommonRegistration registration) {
2021
registration.registerBlockDataProvider(new PrismaticColorBlockProvider(), BlockEntity.class);
2122
registration.registerBlockDataProvider(new MicroverseInfoBlockProvider(), BlockEntity.class);
2223
registration.registerBlockDataProvider(new SculkVatXPProvider(), BlockEntity.class);
24+
registration.registerBlockDataProvider(new OmnicSynthProgressProvider(), BlockEntity.class);
2325
}
2426

2527
@Override
2628
public void registerClient(IWailaClientRegistration registration) {
2729
registration.registerBlockComponent(new PrismaticColorBlockProvider(), Block.class);
2830
registration.registerBlockComponent(new MicroverseInfoBlockProvider(), Block.class);
2931
registration.registerBlockComponent(new SculkVatXPProvider(), Block.class);
32+
registration.registerBlockComponent(new OmnicSynthProgressProvider(), Block.class);
3033
}
3134
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package net.neganote.monilabs.integration.jade.provider;
2+
3+
import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity;
4+
5+
import net.minecraft.nbt.CompoundTag;
6+
import net.minecraft.network.chat.Component;
7+
import net.minecraft.resources.ResourceLocation;
8+
import net.neganote.monilabs.MoniLabs;
9+
import net.neganote.monilabs.common.machine.multiblock.OmnicSynthesizerMachine;
10+
11+
import snownee.jade.api.BlockAccessor;
12+
import snownee.jade.api.IBlockComponentProvider;
13+
import snownee.jade.api.IServerDataProvider;
14+
import snownee.jade.api.ITooltip;
15+
import snownee.jade.api.config.IPluginConfig;
16+
17+
public class OmnicSynthProgressProvider implements IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
18+
19+
@Override
20+
public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPluginConfig iPluginConfig) {
21+
if (blockAccessor.getBlockEntity() instanceof MetaMachineBlockEntity meta_machine_be &&
22+
meta_machine_be.getMetaMachine() instanceof OmnicSynthesizerMachine) {
23+
CompoundTag data = blockAccessor.getServerData();
24+
if (data.contains("currentDiversityPoints")) {
25+
var currentDiversityPoints = data.getInt("currentDiversityPoints");
26+
iTooltip.add(Component.translatable("monilabs.omnic.current_diversity_points",
27+
currentDiversityPoints)
28+
.append(Component.literal("%")));
29+
}
30+
}
31+
}
32+
33+
@Override
34+
public void appendServerData(CompoundTag compoundTag, BlockAccessor blockAccessor) {
35+
if (blockAccessor.getBlockEntity() instanceof MetaMachineBlockEntity meta_machine_be &&
36+
meta_machine_be.getMetaMachine() instanceof OmnicSynthesizerMachine machine && machine.isFormed()) {
37+
compoundTag.putInt("currentDiversityPoints", machine.diversityPoints);
38+
}
39+
}
40+
41+
@Override
42+
public ResourceLocation getUid() {
43+
return MoniLabs.id("omnic_synth_info");
44+
}
45+
}

0 commit comments

Comments
 (0)