Skip to content

Commit 216cf0d

Browse files
committed
Rename translation strings for Ethylene to match the internal name and the IUPAC standard of Ethene. Also add aliases to search to help ease transition, and make EMI chemical serializers use the registry name as the prefix
1 parent 5a342c9 commit 216cf0d

File tree

16 files changed

+81
-55
lines changed

16 files changed

+81
-55
lines changed

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

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

src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json

Lines changed: 7 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/assets/mekanism/lang/en_us.json

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

src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd

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

src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generators/java/mekanism/generators/client/GeneratorsLangProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private void addAdvancements() {
102102
add(GeneratorsAdvancements.HEAT_GENERATOR, "Your First Generator", "Craft a Heat Generator to start making power");
103103
add(GeneratorsAdvancements.SOLAR_GENERATOR, "Power of the Sun", "Renewable daytime energy");
104104
add(GeneratorsAdvancements.WIND_GENERATOR, "Spin Baby Spin", "Hopefully there is some wind nearby");
105-
add(GeneratorsAdvancements.BURN_THE_GAS, "Burn the Gas", "Craft a Gas-Burning Generator to burn Ethylene");
105+
add(GeneratorsAdvancements.BURN_THE_GAS, "Burn the Gas", "Craft a Gas-Burning Generator to burn Ethene");
106106
}
107107

108108
private void addMisc() {

src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private void addTags() {
184184

185185
addTag(MekanismTags.Fluids.BRINE, "Brine");
186186
addTag(MekanismTags.Fluids.CHLORINE, "Chlorine");
187-
addTag(MekanismTags.Fluids.ETHENE, "Ethylene");
187+
addTag(MekanismTags.Fluids.ETHENE, "Ethene");
188188
addTag(MekanismTags.Fluids.HEAVY_WATER, "Heavy Water");
189189
addTag(MekanismTags.Fluids.HYDROGEN, "Hydrogen");
190190
addTag(MekanismTags.Fluids.HYDROGEN_CHLORIDE, "Hydrogen Chloride");
@@ -512,7 +512,7 @@ private void addFluids() {
512512
addFluid(MekanismFluids.HYDROFLUORIC_ACID, "Liquid Hydrofluoric Acid");
513513
addFluid(MekanismFluids.URANIUM_OXIDE, "Liquid Uranium Oxide");
514514
addFluid(MekanismFluids.URANIUM_HEXAFLUORIDE, "Liquid Uranium Hexafluoride");
515-
addFluid(MekanismFluids.ETHENE, "Liquid Ethylene");
515+
addFluid(MekanismFluids.ETHENE, "Liquid Ethene");
516516
addFluid(MekanismFluids.SODIUM, "Liquid Sodium");
517517
addFluid(MekanismFluids.SUPERHEATED_SODIUM, "Liquid Superheated Sodium");
518518
addFluid(MekanismFluids.BRINE, "Brine");
@@ -541,7 +541,7 @@ private void addGases() {
541541
add(MekanismGases.HYDROFLUORIC_ACID, "Hydrofluoric Acid");
542542
add(MekanismGases.URANIUM_OXIDE, "Uranium Oxide");
543543
add(MekanismGases.URANIUM_HEXAFLUORIDE, "Uranium Hexafluoride");
544-
add(MekanismGases.ETHENE, "Ethylene");
544+
add(MekanismGases.ETHENE, "Ethene");
545545
add(MekanismGases.SODIUM, "Sodium");
546546
add(MekanismGases.SUPERHEATED_SODIUM, "Superheated Sodium");
547547
add(MekanismGases.BRINE, "Gaseous Brine");
@@ -1033,6 +1033,9 @@ private void addMisc() {
10331033
add(MekanismLang.PROCESS_RATE_MB, "Process Rate: %1$s mB/t");
10341034
add(MekanismLang.TICKS_REQUIRED, "Ticks Required: %1$s");
10351035
add(MekanismLang.DECAY_IMMUNE, "Will not decay inside a Radioactive Waste Barrel");
1036+
//Alias stuff
1037+
add(MekanismLang.ALSO_KNOWN_AS, "Also known as %1$s");
1038+
add(MekanismLang.ETHENE_ETHYLENE_ALIAS, "Ethylene");
10361039
//Gui stuff
10371040
add(MekanismLang.WIDTH, "Width");
10381041
add(MekanismLang.HEIGHT, "Height");

src/generators/java/mekanism/generators/common/MekanismGenerators.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public class MekanismGenerators implements IModModule {
5353
public static final String MODID = "mekanismgenerators";
5454
private static final ConfigBasedCachedFLSupplier ETHENE_ENERGY_DENSITY = new ConfigBasedCachedFLSupplier(() -> {
5555
FloatingLong energy = MekanismGeneratorsConfig.generators.bioGeneration.get().multiply(2)
56-
.timesEqual(MekanismGeneratorsConfig.generators.ethyleneDensityMultiplier.get());
56+
.timesEqual(MekanismGeneratorsConfig.generators.etheneDensityMultiplier.get());
5757
return energy.plusEqual(MekanismConfig.general.FROM_H2.get());
58-
}, MekanismConfig.general.FROM_H2, MekanismGeneratorsConfig.generators.bioGeneration, MekanismGeneratorsConfig.generators.ethyleneDensityMultiplier);
58+
}, MekanismConfig.general.FROM_H2, MekanismGeneratorsConfig.generators.bioGeneration, MekanismGeneratorsConfig.generators.etheneDensityMultiplier);
5959

6060
public static MekanismGenerators instance;
6161

@@ -106,7 +106,7 @@ public static ResourceLocation rl(String path) {
106106
private void commonSetup(FMLCommonSetupEvent event) {
107107
event.enqueueWork(() -> {
108108
//Add fuel attribute to ethene
109-
MekanismGases.ETHENE.get().addAttribute(new Fuel(MekanismGeneratorsConfig.generators.ethyleneBurnTicks, ETHENE_ENERGY_DENSITY));
109+
MekanismGases.ETHENE.get().addAttribute(new Fuel(MekanismGeneratorsConfig.generators.etheneBurnTicks, ETHENE_ENERGY_DENSITY));
110110
//Register dispenser behaviors
111111
GeneratorsFluids.FLUIDS.registerBucketDispenserBehavior();
112112
//Register extended build commands (in enqueue as it is not thread safe)

src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public class GeneratorsConfig extends BaseMekanismConfig {
4343
public final CachedIntValue heatGenerationFluidRate;
4444

4545
public final CachedLongValue gbgTankCapacity;
46-
public final CachedIntValue ethyleneBurnTicks;
47-
public final CachedFloatingLongValue ethyleneDensityMultiplier;
46+
public final CachedIntValue etheneBurnTicks;
47+
public final CachedFloatingLongValue etheneDensityMultiplier;
4848

4949
public final CachedFloatingLongValue solarGeneration;
5050
public final CachedIntValue turbineBladesPerCoil;
@@ -120,10 +120,10 @@ public class GeneratorsConfig extends BaseMekanismConfig {
120120
builder.comment("Gas-Burning Generator Settings").push(GAS_CATEGORY);
121121
gbgTankCapacity = CachedLongValue.wrap(this, builder.comment("The capacity in mB of the gas tank in the Gas-Burning Generator.")
122122
.defineInRange("tankCapacity", 18L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE));
123-
ethyleneBurnTicks = CachedIntValue.wrap(this, builder.comment("The number of ticks each mB of Ethylene burns for in the Gas-Burning Generator.")
124-
.defineInRange("ethyleneBurnTicks", 2 * SharedConstants.TICKS_PER_SECOND, 1, Integer.MAX_VALUE));
125-
ethyleneDensityMultiplier = CachedFloatingLongValue.define(this, builder, "Multiplier for calculating the energy density of Ethylene (1 mB Hydrogen + 2 * bioGeneration * densityMultiplier).",
126-
"ethyleneDensityMultiplier", FloatingLong.createConst(40), CachedFloatingLongValue.POSITIVE);
123+
etheneBurnTicks = CachedIntValue.wrap(this, builder.comment("The number of ticks each mB of Ethene burns for in the Gas-Burning Generator.")
124+
.defineInRange("etheneBurnTicks", 2 * SharedConstants.TICKS_PER_SECOND, 1, Integer.MAX_VALUE));
125+
etheneDensityMultiplier = CachedFloatingLongValue.define(this, builder, "Multiplier for calculating the energy density of Ethene (1 mB Hydrogen + 2 * bioGeneration * densityMultiplier).",
126+
"etheneDensityMultiplier", FloatingLong.createConst(40), CachedFloatingLongValue.POSITIVE);
127127
builder.pop();
128128

129129
builder.comment("Turbine Settings").push(TURBINE_CATEGORY);

0 commit comments

Comments
 (0)