Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flavour text for Quark Items #795

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Flavour text for Quark Items #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/generated/assets/minelabs/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"entity.minecraft.villager.sciencevillager": "Science Villager",
"entity.minelabs.balloon": "Balloon",
"entity.minelabs.bohr_blueprint_entity": "Bohr Entity",
"entity.minelabs.corrosive": "missing_translation",
"entity.minelabs.entropy_creeper": "Entropy Creeper",
"entity.minelabs.subatomic_particle_entity": "Subatomic Particle",
"item.minelabs.atom.actinium_atom": "Actinium",
Expand Down Expand Up @@ -313,12 +314,22 @@
"reaction.minelabs.flammable": "Flammable",
"reaction.minelabs.poisonous": "Poisonous",
"text.minelabs.active": "Active",
"text.minelabs.anti_quark.color.blue": "Color: Anti-Blue",
"text.minelabs.anti_quark.color.green": "Color: Anti-Green",
"text.minelabs.anti_quark.color.red": "Color: Anti-Red",
"text.minelabs.anti_quark.electric_down": "Charge: +1/3",
"text.minelabs.anti_quark.electric_up": "Charge: -2/3",
"text.minelabs.clear_grid": "Clear Grid",
"text.minelabs.clear_slots": "Clear Input Slots",
"text.minelabs.inactive": "Inactive",
"text.minelabs.invalid": "Incomplete Molecule",
"text.minelabs.multiple_molecules": "Too many molecules",
"text.minelabs.not_implemented": "Molecule is not implemented",
"text.minelabs.quark.color.blue": "Color: Blue",
"text.minelabs.quark.color.green": "Color: Green",
"text.minelabs.quark.color.red": "Color: Red",
"text.minelabs.quark.electric_down": "Charge: -1/3",
"text.minelabs.quark.electric_up": "Charge: +2/3",
"text.minelabs.toggle_instruction": "Shift + Right click to toggle",
"text.minelabs.valid": "Correct Molecule"
}
11 changes: 11 additions & 0 deletions src/main/generated/assets/minelabs/lang/nl_be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"entity.minecraft.villager.sciencevillager": "Wetenschaps Dorpeling",
"entity.minelabs.balloon": "Ballon",
"entity.minelabs.bohr_blueprint_entity": "Bohr Entity",
"entity.minelabs.corrosive": "missing_translation",
"entity.minelabs.entropy_creeper": "Entropie Creeper",
"entity.minelabs.subatomic_particle_entity": "Subatomisch Deeltje",
"item.minelabs.atom.actinium_atom": "Actinium",
Expand Down Expand Up @@ -313,12 +314,22 @@
"reaction.minelabs.flammable": "Brandbaar",
"reaction.minelabs.poisonous": "Giftig",
"text.minelabs.active": "Actief",
"text.minelabs.anti_quark.color.blue": "Kleur: Anti-Blauw",
"text.minelabs.anti_quark.color.green": "Kleur: Anti-Groen",
"text.minelabs.anti_quark.color.red": "Kleur: Anti-Rood",
"text.minelabs.anti_quark.electric_down": "Lading: +1/3",
"text.minelabs.anti_quark.electric_up": "Lading: -2/3",
"text.minelabs.clear_grid": "Rooster leegmagen",
"text.minelabs.clear_slots": "Invoer leegmaken",
"text.minelabs.inactive": "Inactief",
"text.minelabs.invalid": "Onvolledige Molecule",
"text.minelabs.multiple_molecules": "Te veel moleculen",
"text.minelabs.not_implemented": "Molecule zit niet in het spel",
"text.minelabs.quark.color.blue": "Kleur: Blauw",
"text.minelabs.quark.color.green": "Kleur: Groen",
"text.minelabs.quark.color.red": "Kleur: Rood",
"text.minelabs.quark.electric_down": "Lading: -1/3",
"text.minelabs.quark.electric_up": "Lading: +2/3",
"text.minelabs.toggle_instruction": "Shift Klik met de rechtermuisknop om te wisselen",
"text.minelabs.valid": "Correcte Molecule"
}
11 changes: 11 additions & 0 deletions src/main/generated/assets/minelabs/lang/nl_nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"entity.minecraft.villager.sciencevillager": "Wetenschaps Dorpeling",
"entity.minelabs.balloon": "Ballon",
"entity.minelabs.bohr_blueprint_entity": "Bohr Entity",
"entity.minelabs.corrosive": "missing_translation",
"entity.minelabs.entropy_creeper": "Entropie Creeper",
"entity.minelabs.subatomic_particle_entity": "Subatomisch Deeltje",
"item.minelabs.atom.actinium_atom": "Actinium",
Expand Down Expand Up @@ -313,12 +314,22 @@
"reaction.minelabs.flammable": "Brandbaar",
"reaction.minelabs.poisonous": "Giftig",
"text.minelabs.active": "Actief",
"text.minelabs.anti_quark.color.blue": "Kleur: Anti-Blauw",
"text.minelabs.anti_quark.color.green": "Kleur: Anti-Groen",
"text.minelabs.anti_quark.color.red": "Kleur: Anti-Rood",
"text.minelabs.anti_quark.electric_down": "Lading: +1/3",
"text.minelabs.anti_quark.electric_up": "Lading: -2/3",
"text.minelabs.clear_grid": "Rooster leegmagen",
"text.minelabs.clear_slots": "Invoer leegmaken",
"text.minelabs.inactive": "Inactief",
"text.minelabs.invalid": "Onvolledige Molecule",
"text.minelabs.multiple_molecules": "Te veel moleculen",
"text.minelabs.not_implemented": "Molecule zit niet in het spel",
"text.minelabs.quark.color.blue": "Kleur: Blauw",
"text.minelabs.quark.color.green": "Kleur: Groen",
"text.minelabs.quark.color.red": "Kleur: Rood",
"text.minelabs.quark.electric_down": "Lading: -1/3",
"text.minelabs.quark.electric_up": "Lading: +2/3",
"text.minelabs.toggle_instruction": "Shift Klik met de rechtermuisknop om te wisselen",
"text.minelabs.valid": "Correcte Molecule"
}
13 changes: 13 additions & 0 deletions src/main/java/be/minelabs/data/lang/MinelabsLangProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,19 @@ public void generateTranslations(TranslationBuilder translationBuilder) {
translationBuilder.add("text.minelabs.active", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.inactive", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.toggle_instruction", EMPTY_TRANSLATION);

translationBuilder.add("text.minelabs.anti_quark.electric_down", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.anti_quark.electric_up", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.quark.electric_down", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.quark.electric_up", EMPTY_TRANSLATION);

translationBuilder.add("text.minelabs.quark.color.red", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.quark.color.green", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.quark.color.blue", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.anti_quark.color.red", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.anti_quark.color.green", EMPTY_TRANSLATION);
translationBuilder.add("text.minelabs.anti_quark.color.blue", EMPTY_TRANSLATION);

// manual : PAINTING author/title
translationBuilder.add("painting.minelabs.lab_compressedgas.author", DEFAULT_ARTIST);
translationBuilder.add("painting.minelabs.lab_compressedgas.title", EMPTY_TRANSLATION);
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/be/minelabs/item/Items.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,18 +195,18 @@ public class Items {

// Items > Elementary particles

public static final Item UPQUARK_RED = register(new Item(new Item.Settings().maxCount(64)), "subatomic/upquark_red");
public static final Item UPQUARK_GREEN = register(new Item(new Item.Settings().maxCount(64)), "subatomic/upquark_green");
public static final Item UPQUARK_BLUE = register(new Item(new Item.Settings().maxCount(64)), "subatomic/upquark_blue");
public static final Item ANTI_UPQUARK_RED = register(new Item(new Item.Settings().maxCount(64)), "subatomic/anti_upquark_red");
public static final Item ANTI_UPQUARK_GREEN = register(new Item(new Item.Settings().maxCount(64)), "subatomic/anti_upquark_green");
public static final Item ANTI_UPQUARK_BLUE = register(new Item(new Item.Settings().maxCount(64)), "subatomic/anti_upquark_blue");
public static final Item DOWNQUARK_RED = register(new Item(new Item.Settings().maxCount(64)), "subatomic/downquark_red");
public static final Item DOWNQUARK_GREEN = register(new Item(new Item.Settings().maxCount(64)), "subatomic/downquark_green");
public static final Item DOWNQUARK_BLUE = register(new Item(new Item.Settings().maxCount(64)), "subatomic/downquark_blue");
public static final Item ANTI_DOWNQUARK_RED = register(new Item(new Item.Settings().maxCount(64)), "subatomic/anti_downquark_red");
public static final Item ANTI_DOWNQUARK_GREEN = register(new Item(new Item.Settings().maxCount(64)), "subatomic/anti_downquark_green");
public static final Item ANTI_DOWNQUARK_BLUE = register(new Item(new Item.Settings().maxCount(64)), "subatomic/anti_downquark_blue");
public static final Item UPQUARK_RED = register(new QuarkItem(new FabricItemSettings()), "subatomic/upquark_red");
public static final Item UPQUARK_GREEN = register(new QuarkItem(new FabricItemSettings()), "subatomic/upquark_green");
public static final Item UPQUARK_BLUE = register(new QuarkItem(new FabricItemSettings()), "subatomic/upquark_blue");
public static final Item ANTI_UPQUARK_RED = register(new QuarkItem(new FabricItemSettings()), "subatomic/anti_upquark_red");
public static final Item ANTI_UPQUARK_GREEN = register(new QuarkItem(new FabricItemSettings()), "subatomic/anti_upquark_green");
public static final Item ANTI_UPQUARK_BLUE = register(new QuarkItem(new FabricItemSettings()), "subatomic/anti_upquark_blue");
public static final Item DOWNQUARK_RED = register(new QuarkItem(new FabricItemSettings()), "subatomic/downquark_red");
public static final Item DOWNQUARK_GREEN = register(new QuarkItem(new FabricItemSettings()), "subatomic/downquark_green");
public static final Item DOWNQUARK_BLUE = register(new QuarkItem(new FabricItemSettings()), "subatomic/downquark_blue");
public static final Item ANTI_DOWNQUARK_RED = register(new QuarkItem(new FabricItemSettings()), "subatomic/anti_downquark_red");
public static final Item ANTI_DOWNQUARK_GREEN = register(new QuarkItem(new FabricItemSettings()), "subatomic/anti_downquark_green");
public static final Item ANTI_DOWNQUARK_BLUE = register(new QuarkItem(new FabricItemSettings()), "subatomic/anti_downquark_blue");

public static final Item GLUON = register(new Item(new Item.Settings().maxCount(64)), "subatomic/gluon");

Expand Down Expand Up @@ -341,7 +341,7 @@ private static <T extends Item> T register(T item, Identifier identifier) {
return Registry.register(Registries.ITEM, identifier, item);
}

private static AtomItem registerAtom(Atom atom){
private static AtomItem registerAtom(Atom atom) {
AtomItem item = register(new AtomItem(new Item.Settings(), atom), atom.getItemId());
atom.setItem(item);
return item;
Expand Down
45 changes: 45 additions & 0 deletions src/main/java/be/minelabs/item/QuarkItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package be.minelabs.item;

import net.minecraft.client.item.TooltipContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

import java.util.List;

public class QuarkItem extends Item {

public QuarkItem(Settings settings) {
super(settings);
}

@Override
public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
// color RED/GREEN/BLUE OR ANTI-RED/ANTI-GREEN/ANTI-BLUE
// electric: up +2/3 , down -1/3 , anti-up: -2/3 , anti-down: +1/3
String[] key = getTranslationKey().split("_");
boolean anti_particle = key[0].contains("anti");


tooltip.add(Text.translatable(anti_particle ? "text.minelabs.anti_quark.color." + key[key.length - 1]
: "text.minelabs.quark.color." + key[key.length - 1]));

if (anti_particle) {
// ANTI PARTICLE
if (key[1].contains("up")) {
tooltip.add(Text.translatable("text.minelabs.anti_quark.electric_up"));
} else {
tooltip.add(Text.translatable("text.minelabs.anti_quark.electric_down"));
}
} else {
// NOT ANTI PARTICLE
if (key[0].contains("up")) {
tooltip.add(Text.translatable("text.minelabs.quark.electric_up"));
} else {
tooltip.add(Text.translatable("text.minelabs.quark.electric_down"));
}
}
}
}
11 changes: 11 additions & 0 deletions src/main/resources/assets/minelabs/lang/en_us.static.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
"text.minelabs.toggle_instruction": "Shift + Right click to toggle",
"text.minelabs.clear_slots": "Clear Input Slots",
"text.minelabs.clear_grid": "Clear Grid",
"text.minelabs.anti_quark.electric_down": "Charge: +1/3",
"text.minelabs.anti_quark.electric_up": "Charge: -2/3",
"text.minelabs.quark.electric_down":"Charge: -1/3",
"text.minelabs.quark.electric_up": "Charge: +2/3",

"text.minelabs.quark.color.red": "Color: Red",
"text.minelabs.quark.color.green": "Color: Green",
"text.minelabs.quark.color.blue": "Color: Blue",
"text.minelabs.anti_quark.color.red": "Color: Anti-Red",
"text.minelabs.anti_quark.color.green": "Color: Anti-Green",
"text.minelabs.anti_quark.color.blue": "Color: Anti-Blue",
"block.minelabs.charged_point": "Point Charge",
"block.minelabs.fire.green_fire": "Green Fire",
"block.minelabs.chemical.ccl4": "Carbon Tetrachloride (CCl\u2084)",
Expand Down
11 changes: 11 additions & 0 deletions src/main/resources/assets/minelabs/lang/nl_be.static.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
"text.minelabs.toggle_instruction": "Shift Klik met de rechtermuisknop om te wisselen",
"text.minelabs.clear_slots": "Invoer leegmaken",
"text.minelabs.clear_grid": "Rooster leegmagen",
"text.minelabs.anti_quark.electric_down": "Lading: +1/3",
"text.minelabs.anti_quark.electric_up": "Lading: -2/3",
"text.minelabs.quark.electric_down":"Lading: -1/3",
"text.minelabs.quark.electric_up": "Lading: +2/3",

"text.minelabs.quark.color.red": "Kleur: Rood",
"text.minelabs.quark.color.green": "Kleur: Groen",
"text.minelabs.quark.color.blue": "Kleur: Blauw",
"text.minelabs.anti_quark.color.red": "Kleur: Anti-Rood",
"text.minelabs.anti_quark.color.green": "Kleur: Anti-Groen",
"text.minelabs.anti_quark.color.blue": "Kleur: Anti-Blauw",
"block.minelabs.chemical.ccl4": "Tetrachloormethaan (CCl\u2084)",
"block.minelabs.chemical.ch4o": "Methanol (CH\u2084O)",
"block.minelabs.chemical.cs2": "Koolstofdisulfide (CS\u2082)",
Expand Down