From caae13f2da1260e89fa2bc69b44748d158dbf9a5 Mon Sep 17 00:00:00 2001 From: Sara Freimer Date: Fri, 23 Aug 2024 17:25:13 -0500 Subject: [PATCH] Move baby biome and structure spawn blacklist to tags (syntax using mekanismadditions:blacklist_baby_creepers and the like). Also moved the wind generator's dimension blacklist to a dimension type tag c:no_wind and fixed wind generator item rendering bugging out when in a blacklisted dimension --- .../common/config/AdditionsConfig.java | 9 - .../config/AdditionsConfigTranslations.java | 16 +- .../common/entity/baby/BabyType.java | 23 ++- .../BabyEntitySpawnBiomeModifier.java | 11 +- .../BabyEntitySpawnStructureModifier.java | 9 +- .../java/mekanism/api/MekanismAPITags.java | 160 ++++++++++++++---- .../2ca94f3a6e22cb9eec299788405fc6e4ad158c09 | 4 +- .../c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 | 10 +- .../mekanism/assets/mekanism/lang/en_au.json | 2 +- .../mekanism/assets/mekanism/lang/en_gb.json | 2 +- .../mekanism/assets/mekanism/lang/en_ud.json | 2 +- .../mekanism/assets/mekanism/lang/en_us.json | 2 +- .../data/mekanism/computer_help/jekyll.md | 2 +- .../dfe6eafb7c0d05a49bee122125cab06c7b53ab0b | 6 +- .../assets/mekanismadditions/lang/en_ud.json | 36 ---- .../assets/mekanismadditions/lang/en_us.json | 36 ---- .../de34ee0556eec16c961269bcb7ec3070f0579cfd | 6 +- .../assets/mekanismgenerators/lang/en_ud.json | 3 - .../assets/mekanismgenerators/lang/en_us.json | 3 - .../common/tag/MekanismTagProvider.java | 2 +- .../client/model/ModelWindGenerator.java | 9 +- .../client/render/RenderWindGenerator.java | 8 +- .../render/item/RenderWindGeneratorItem.java | 24 ++- .../common/config/GeneratorsConfig.java | 7 - .../config/GeneratorsConfigTranslations.java | 2 - .../common/tile/TileEntityWindGenerator.java | 7 +- .../config/MekanismConfigTranslations.java | 2 +- .../CachedResourceLocationListValue.java | 52 ------ 28 files changed, 201 insertions(+), 254 deletions(-) delete mode 100644 src/main/java/mekanism/common/config/value/CachedResourceLocationListValue.java diff --git a/src/additions/java/mekanism/additions/common/config/AdditionsConfig.java b/src/additions/java/mekanism/additions/common/config/AdditionsConfig.java index c7e7698b667..1be3b1fc5ab 100644 --- a/src/additions/java/mekanism/additions/common/config/AdditionsConfig.java +++ b/src/additions/java/mekanism/additions/common/config/AdditionsConfig.java @@ -13,11 +13,8 @@ import mekanism.common.config.value.CachedDoubleValue; import mekanism.common.config.value.CachedFloatValue; import mekanism.common.config.value.CachedIntValue; -import mekanism.common.config.value.CachedResourceLocationListValue; import net.minecraft.SharedConstants; import net.minecraft.core.Holder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.biome.MobSpawnSettings; @@ -105,8 +102,6 @@ public static class SpawnConfig { public final CachedDoubleValue weightPercentage; public final CachedDoubleValue spawnCostPerEntityPercentage; public final CachedDoubleValue maxSpawnCostPercentage; - public final CachedResourceLocationListValue biomeBlackList; - public final CachedResourceLocationListValue structureBlackList; public final Holder> entityType; public final EntityType parentType; @@ -134,10 +129,6 @@ private SpawnConfig(IMekanismConfig config, ModConfigSpec.Builder builder, Strin this.maxSpawnCostPercentage = CachedDoubleValue.wrap(config, translations.maxCost().applyToBuilder(builder) .worldRestart() .defineInRange("maxSpawnCostPercentage", 1D, 0, 100)); - this.biomeBlackList = CachedResourceLocationListValue.define(config, translations.biomeBlacklist().applyToBuilder(builder) - .worldRestart(), "biomeBlackList", ResourceLocation.withDefaultNamespace("plains")); - this.structureBlackList = CachedResourceLocationListValue.define(config, translations.structureBlacklist().applyToBuilder(builder) - .worldRestart(), "structureBlackList", ResourceLocation.withDefaultNamespace("fortress"), BuiltInRegistries.STRUCTURE_TYPE::containsKey); builder.pop(); } diff --git a/src/additions/java/mekanism/additions/common/config/AdditionsConfigTranslations.java b/src/additions/java/mekanism/additions/common/config/AdditionsConfigTranslations.java index f477d9f42af..3cee84926f5 100644 --- a/src/additions/java/mekanism/additions/common/config/AdditionsConfigTranslations.java +++ b/src/additions/java/mekanism/additions/common/config/AdditionsConfigTranslations.java @@ -76,13 +76,11 @@ public record BabySpawnTranslations( IConfigTranslation maxSize, IConfigTranslation weight, IConfigTranslation costPerEntity, - IConfigTranslation maxCost, - IConfigTranslation biomeBlacklist, - IConfigTranslation structureBlacklist + IConfigTranslation maxCost ) { public IConfigTranslation[] toArray() { - return new IConfigTranslation[]{topLevel, shouldSpawn, minSize, maxSize, weight, costPerEntity, maxCost, biomeBlacklist, structureBlacklist}; + return new IConfigTranslation[]{topLevel, shouldSpawn, minSize, maxSize, weight, costPerEntity, maxCost}; } private static String getKey(String name, String path) { @@ -98,15 +96,7 @@ public static BabySpawnTranslations create(String key) { new ConfigTranslation(getKey(key, "max_size"), "Max Group Size", "The multiplier for maximum group size of " + name + " spawns, compared to the adult mob."), new ConfigTranslation(getKey(key, "weight"), "Weight Multiplier", "The multiplier for weight of " + name + " spawns, compared to the adult mob."), new ConfigTranslation(getKey(key, "cost_per_entity"), "Cost Per Entity Multiplier", "The multiplier for spawn cost per entity of " + name + " spawns, compared to the adult mob."), - new ConfigTranslation(getKey(key, "max_cost"), "Max Cost Multiplier", "The multiplier for max spawn cost of " + name + " spawns, compared to the adult mob."), - new ConfigTranslation(getKey(key, "biome_blacklist"), - "Biome Blacklist", "The list of biome ids that " + name + " will not spawn in even if the normal mob variant can spawn.", - "Edit Blacklist" - ), - new ConfigTranslation(getKey(key, "structure_blacklist"), "Structure Blacklist", - "The list of structure ids that " + name + " will not spawn in even if the normal mob variant can spawn.", - "Edit Blacklist" - ) + new ConfigTranslation(getKey(key, "max_cost"), "Max Cost Multiplier", "The multiplier for max spawn cost of " + name + " spawns, compared to the adult mob.") ); } diff --git a/src/additions/java/mekanism/additions/common/entity/baby/BabyType.java b/src/additions/java/mekanism/additions/common/entity/baby/BabyType.java index 7af96d18f87..e7e6e3cc89d 100644 --- a/src/additions/java/mekanism/additions/common/entity/baby/BabyType.java +++ b/src/additions/java/mekanism/additions/common/entity/baby/BabyType.java @@ -2,23 +2,32 @@ import com.mojang.serialization.Codec; import java.util.Locale; +import mekanism.api.MekanismAPITags; +import net.minecraft.tags.TagKey; import net.minecraft.util.StringRepresentable; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.levelgen.structure.Structure; import org.jetbrains.annotations.NotNull; public enum BabyType implements StringRepresentable { - BOGGED, - CREEPER, - ENDERMAN, - SKELETON, - STRAY, - WITHER_SKELETON; + BOGGED(MekanismAPITags.Biomes.BLACKLIST_BABY_BOGGED, MekanismAPITags.Structures.BLACKLIST_BABY_BOGGED), + CREEPER(MekanismAPITags.Biomes.BLACKLIST_BABY_CREEPERS, MekanismAPITags.Structures.BLACKLIST_BABY_CREEPERS), + ENDERMAN(MekanismAPITags.Biomes.BLACKLIST_BABY_ENDERMEN, MekanismAPITags.Structures.BLACKLIST_BABY_ENDERMEN), + SKELETON(MekanismAPITags.Biomes.BLACKLIST_BABY_SKELETONS, MekanismAPITags.Structures.BLACKLIST_BABY_SKELETONS), + STRAY(MekanismAPITags.Biomes.BLACKLIST_BABY_STRAYS, MekanismAPITags.Structures.BLACKLIST_BABY_STRAYS), + WITHER_SKELETON(MekanismAPITags.Biomes.BLACKLIST_BABY_WITHER_SKELETONS, MekanismAPITags.Structures.BLACKLIST_BABY_WITHER_SKELETONS); public static final Codec CODEC = StringRepresentable.fromEnum(BabyType::values); + public final TagKey structureBlacklist; + public final TagKey biomeBlacklist; private final String serializedName; - BabyType() { + BabyType(TagKey biomeBlacklist, TagKey structureBlacklist) { this.serializedName = name().toLowerCase(Locale.ROOT); + this.biomeBlacklist = biomeBlacklist; + this.structureBlacklist = structureBlacklist; + } @NotNull diff --git a/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnBiomeModifier.java b/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnBiomeModifier.java index 71b0b16e200..31e8af3492c 100644 --- a/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnBiomeModifier.java +++ b/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnBiomeModifier.java @@ -11,15 +11,13 @@ import mekanism.common.Mekanism; import mekanism.common.util.RegistryUtils; import net.minecraft.core.Holder; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.MobSpawnSettings; import net.neoforged.neoforge.common.world.BiomeModifier; import net.neoforged.neoforge.common.world.MobSpawnSettingsBuilder; import net.neoforged.neoforge.common.world.ModifiableBiomeInfo.BiomeInfo; -import net.neoforged.neoforge.server.ServerLifecycleHooks; public record BabyEntitySpawnBiomeModifier(BabyType babyType, AdditionsConfig.SpawnConfig spawnConfig) implements BiomeModifier { @@ -32,8 +30,7 @@ public void modify(Holder biome, Phase phase, BiomeInfo.Builder builder) if (phase == Phase.REMOVE && spawnConfig.shouldSpawn.get()) { //Note: We need to run after addition in case we ran after any mods added their skeletons, // but we run before after everything to make it easier for another mod to remove us - ResourceLocation biomeName = ServerLifecycleHooks.getCurrentServer().registryAccess().registryOrThrow(Registries.BIOME).getKey(biome.value()); - if (!spawnConfig.biomeBlackList.get().contains(biomeName)) { + if (!biome.is(babyType.biomeBlacklist)) { MobSpawnSettingsBuilder mobSpawnSettings = builder.getMobSpawnSettings(); List monsterSpawns = mobSpawnSettings.getSpawner(MobCategory.MONSTER); for (MobSpawnSettings.SpawnerData spawner : spawnConfig.getSpawnersToAdd(monsterSpawns)) { @@ -41,13 +38,13 @@ public void modify(Holder biome, Phase phase, BiomeInfo.Builder builder) MobSpawnSettings.MobSpawnCost parentCost = mobSpawnSettings.getCost(spawnConfig.parentType); if (parentCost == null) { Mekanism.logger.debug("Adding spawn rate for '{}' in biome '{}', with weight: {}, minSize: {}, maxSize: {}", - RegistryUtils.getName(spawner.type), biomeName, spawner.getWeight(), spawner.minCount, spawner.maxCount); + RegistryUtils.getName(spawner.type), biome.unwrapKey().map(ResourceKey::location).orElse(null), spawner.getWeight(), spawner.minCount, spawner.maxCount); } else { double spawnCostPerEntity = parentCost.charge() * spawnConfig.spawnCostPerEntityPercentage.get(); double maxSpawnCost = parentCost.energyBudget() * spawnConfig.maxSpawnCostPercentage.get(); mobSpawnSettings.addMobCharge(spawner.type, spawnCostPerEntity, maxSpawnCost); Mekanism.logger.debug("Adding spawn rate for '{}' in biome '{}', with weight: {}, minSize: {}, maxSize: {}, spawnCostPerEntity: {}, maxSpawnCost: {}", - RegistryUtils.getName(spawner.type), biomeName, spawner.getWeight(), spawner.minCount, spawner.maxCount, spawnCostPerEntity, maxSpawnCost); + RegistryUtils.getName(spawner.type), biome.unwrapKey().map(ResourceKey::location).orElse(null), spawner.getWeight(), spawner.minCount, spawner.maxCount, spawnCostPerEntity, maxSpawnCost); } } } diff --git a/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnStructureModifier.java b/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnStructureModifier.java index 8f59c55bb56..21d090ac432 100644 --- a/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnStructureModifier.java +++ b/src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnStructureModifier.java @@ -10,8 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.RegistryUtils; import net.minecraft.core.Holder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.biome.MobSpawnSettings; import net.minecraft.world.level.levelgen.structure.Structure; @@ -34,12 +33,12 @@ public void modify(Holder structure, Phase phase, StructureInfo.Build StructureSettingsBuilder structureSettings = builder.getStructureSettings(); StructureSpawnOverrideBuilder spawnOverrides = structureSettings.getSpawnOverrides(MobCategory.MONSTER); //Fail quick if there are no overrides for this structure, or it is blacklisted - ResourceLocation structureName = BuiltInRegistries.STRUCTURE_TYPE.getKey(structure.value().type()); - if (spawnOverrides != null && !spawnConfig.structureBlackList.get().contains(structureName)) { + if (spawnOverrides != null && !structure.is(babyType.structureBlacklist)) { for (MobSpawnSettings.SpawnerData spawner : spawnConfig.getSpawnersToAdd(spawnOverrides.getSpawns())) { spawnOverrides.addSpawn(spawner); Mekanism.logger.debug("Adding spawn rate for '{}' in structure '{}', with weight: {}, minSize: {}, maxSize: {}", - RegistryUtils.getName(spawner.type), structureName, spawner.getWeight(), spawner.minCount, spawner.maxCount); + RegistryUtils.getName(spawner.type), structure.unwrapKey().map(ResourceKey::location).orElse(null), spawner.getWeight(), + spawner.minCount, spawner.maxCount); } } } diff --git a/src/api/java/mekanism/api/MekanismAPITags.java b/src/api/java/mekanism/api/MekanismAPITags.java index 365af0d122c..eef8bee0ff5 100644 --- a/src/api/java/mekanism/api/MekanismAPITags.java +++ b/src/api/java/mekanism/api/MekanismAPITags.java @@ -9,6 +9,9 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.Item; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.dimension.DimensionType; +import net.minecraft.world.level.levelgen.structure.Structure; /** * Provides access to pre-existing tag keys for various functionality that we use tags for. @@ -27,6 +30,44 @@ private static ResourceLocation rl(String path) { return ResourceLocation.fromNamespaceAndPath(MekanismAPI.MEKANISM_MODID, path); } + /** + * @since 10.6.4 + */ + public static class Biomes { + + private Biomes() { + } + + /** + * Represents any biomes that baby bogged should not spawn in, even if normal bogged do. + */ + public static final TagKey BLACKLIST_BABY_BOGGED = additionsTag("blacklist_baby_bogged"); + /** + * Represents any biomes that baby creepers should not spawn in, even if normal creepers do. + */ + public static final TagKey BLACKLIST_BABY_CREEPERS = additionsTag("blacklist_baby_creepers"); + /** + * Represents any biomes that baby endermen should not spawn in, even if normal endermen do. + */ + public static final TagKey BLACKLIST_BABY_ENDERMEN = additionsTag("blacklist_baby_endermen"); + /** + * Represents any biomes that baby skeletons should not spawn in, even if normal skeletons do. + */ + public static final TagKey BLACKLIST_BABY_SKELETONS = additionsTag("blacklist_baby_skeletons"); + /** + * Represents any biomes that baby strays should not spawn in, even if normal strays do. + */ + public static final TagKey BLACKLIST_BABY_STRAYS = additionsTag("blacklist_baby_strays"); + /** + * Represents any biomes that baby wither skeletons should not spawn in, even if normal wither skeletons do. + */ + public static final TagKey BLACKLIST_BABY_WITHER_SKELETONS = additionsTag("blacklist_baby_wither_skeletons"); + + private static TagKey additionsTag(String name) { + return TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath("mekanismadditions", name)); + } + } + /** * @since 10.7.0 */ @@ -98,6 +139,71 @@ private static TagKey tag(String name) { } } + public static class DamageTypes { + + private DamageTypes() { + } + + /** + * Represents any damage type that is always supported by the MekaSuit. + */ + public static final TagKey MEKASUIT_ALWAYS_SUPPORTED = tag("mekasuit_always_supported"); + /** + * Represents any type of damage that can be prevented by the Scuba Mask or the Inhalation Purification Unit. + */ + public static final TagKey IS_PREVENTABLE_MAGIC = tag("is_preventable_magic"); + + private static TagKey tag(String name) { + return TagKey.create(Registries.DAMAGE_TYPE, rl(name)); + } + } + + /** + * @since 10.6.4 + */ + public static class DimensionTypes { + + private DimensionTypes() { + } + + /** + * Represents any dimension without wind. + * + * @apiNote This is used by Mekanism to determine what dimensions a wind generator can function in. + */ + public static final TagKey NO_WIND = commonTag("no_wind"); + + private static TagKey commonTag(String name) { + return TagKey.create(Registries.DIMENSION_TYPE, ResourceLocation.fromNamespaceAndPath("c", name)); + } + } + + /** + * @since 10.6.3 + */ + public static class Entities { + + private Entities() { + } + + /** + * Represents any entity type that is immune to all Radiation. + */ + public static final TagKey> RADIATION_IMMUNE = commonTag("radiation_immune"); + /** + * Represents any entity type that is immune to Mekanism Radiation. + */ + public static final TagKey> MEK_RADIATION_IMMUNE = tag("radiation_immune"); + + private static TagKey> commonTag(String name) { + return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath("c", name)); + } + + private static TagKey> tag(String name) { + return TagKey.create(Registries.ENTITY_TYPE, rl(name)); + } + } + /** * @since 10.7.0 */ @@ -131,48 +237,42 @@ private static TagKey tag(String name) { } } - public static class DamageTypes { - private DamageTypes() { + /** + * @since 10.6.4 + */ + public static class Structures { + + private Structures() { } /** - * Represents any damage type that is always supported by the MekaSuit. + * Represents any structure that baby bogged should not spawn in, even if normal bogged do. */ - public static final TagKey MEKASUIT_ALWAYS_SUPPORTED = tag("mekasuit_always_supported"); + public static final TagKey BLACKLIST_BABY_BOGGED = additionsTag("blacklist_baby_bogged"); /** - * Represents any type of damage that can be prevented by the Scuba Mask or the Inhalation Purification Unit. + * Represents any structure that baby creepers should not spawn in, even if normal creepers do. */ - public static final TagKey IS_PREVENTABLE_MAGIC = tag("is_preventable_magic"); - - private static TagKey tag(String name) { - return TagKey.create(Registries.DAMAGE_TYPE, rl(name)); - } - } - - /** - * @since 10.6.3 - */ - public static class Entities { - - private Entities() { - } - + public static final TagKey BLACKLIST_BABY_CREEPERS = additionsTag("blacklist_baby_creepers"); /** - * Represents any entity type that is immune to all Radiation. + * Represents any structure that baby endermen should not spawn in, even if normal endermen do. */ - public static final TagKey> RADIATION_IMMUNE = commonTag("radiation_immune"); + public static final TagKey BLACKLIST_BABY_ENDERMEN = additionsTag("blacklist_baby_endermen"); /** - * Represents any entity type that is immune to Mekanism Radiation. + * Represents any structure that baby skeletons should not spawn in, even if normal skeletons do. */ - public static final TagKey> MEK_RADIATION_IMMUNE = tag("radiation_immune"); - - private static TagKey> commonTag(String name) { - return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath("c", name)); - } + public static final TagKey BLACKLIST_BABY_SKELETONS = additionsTag("blacklist_baby_skeletons"); + /** + * Represents any structure that baby strays should not spawn in, even if normal strays do. + */ + public static final TagKey BLACKLIST_BABY_STRAYS = additionsTag("blacklist_baby_strays"); + /** + * Represents any structure that baby wither skeletons should not spawn in, even if normal wither skeletons do. + */ + public static final TagKey BLACKLIST_BABY_WITHER_SKELETONS = additionsTag("blacklist_baby_wither_skeletons"); - private static TagKey> tag(String name) { - return TagKey.create(Registries.ENTITY_TYPE, rl(name)); + private static TagKey additionsTag(String name) { + return TagKey.create(Registries.STRUCTURE, ResourceLocation.fromNamespaceAndPath("mekanismadditions", name)); } } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 index b07f5c87e3e..7a7944e9503 100644 --- a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 +++ b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 @@ -1,6 +1,6 @@ -// 1.21.1 2024-08-22T12:08:47.1660361 ComputerHelp: mekanism +// 1.21.1 2024-08-23T17:06:58.1091512 ComputerHelp: mekanism 740491ca25c3ff0efd50f10d2427e4ceccb0c1e1 data/mekanism/computer_help/enums.csv e43ab1d9e5ae68f834035609a85af3c6ce4161a4 data/mekanism/computer_help/enums.json -7bb884f06b78382db00d074ce682fd2e2e2cd34f data/mekanism/computer_help/jekyll.md +ea53966ab04fba5d8f0fbecd988ffc362eda750a data/mekanism/computer_help/jekyll.md 0442f235be0f36db5728aaf942c99e9c8638f662 data/mekanism/computer_help/methods.csv 366f1717990ae1860dc4739af4a8f441cd0acad5 data/mekanism/computer_help/methods.json diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 index fa7c90db79d..3c00264bce1 100644 --- a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 +++ b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 @@ -1,5 +1,5 @@ -// 1.21.1 2024-08-23T16:30:08.0324099 Languages: en_us for mod: mekanism -996782b41a3e5bde194e8a54e2be422b1433d8e5 assets/mekanism/lang/en_au.json -996782b41a3e5bde194e8a54e2be422b1433d8e5 assets/mekanism/lang/en_gb.json -7d03e8cc8069835e2318b877b4a1806aa6dabe2a assets/mekanism/lang/en_ud.json -e18b2375ed61a8213f361f927a7dc06239250a30 assets/mekanism/lang/en_us.json +// 1.21.1 2024-08-23T17:22:03.3736661 Languages: en_us for mod: mekanism +8d915354d84b3a4d60c65f9280fdd7ceca016c35 assets/mekanism/lang/en_au.json +8d915354d84b3a4d60c65f9280fdd7ceca016c35 assets/mekanism/lang/en_gb.json +04a6d56b0e21031ac0cb1610d71f47ba90d7f0d3 assets/mekanism/lang/en_ud.json +d48161169c06cd14adf0cd8f756b07148642f2b4 assets/mekanism/lang/en_us.json diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_au.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_au.json index 2645adcbbd7..b8ff8f23117 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_au.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_au.json @@ -32,7 +32,7 @@ "configuration.mekanism.client.last_window_positions.color": "Colour Window Position", "configuration.mekanism.client.last_window_positions.color.button": "Edit Colour Position", "configuration.mekanism.client.last_window_positions.color.tooltip": "The last position the Colour window was in when it was closed.", - "configuration.mekanism.client.transmitters.opaque.tooltip": "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurised Tubes, Logistical Transporters, and Thermodynamic Conductors instead ofrendering their contents. If transmitters are causing you fps issues, this should hopefully help.", + "configuration.mekanism.client.transmitters.opaque.tooltip": "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurised Tubes, Logistical Transporters, and Thermodynamic Conductors instead of rendering their contents. If transmitters are causing you fps issues, this should hopefully help.", "configuration.mekanism.gear.free_runners.armored": "Armoured Free Runners", "configuration.mekanism.gear.free_runners.armored.armor": "Armour", "configuration.mekanism.gear.free_runners.armored.armor.tooltip": "Armour value of the Armoured Free Runners", diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_gb.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_gb.json index 2645adcbbd7..b8ff8f23117 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_gb.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_gb.json @@ -32,7 +32,7 @@ "configuration.mekanism.client.last_window_positions.color": "Colour Window Position", "configuration.mekanism.client.last_window_positions.color.button": "Edit Colour Position", "configuration.mekanism.client.last_window_positions.color.tooltip": "The last position the Colour window was in when it was closed.", - "configuration.mekanism.client.transmitters.opaque.tooltip": "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurised Tubes, Logistical Transporters, and Thermodynamic Conductors instead ofrendering their contents. If transmitters are causing you fps issues, this should hopefully help.", + "configuration.mekanism.client.transmitters.opaque.tooltip": "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurised Tubes, Logistical Transporters, and Thermodynamic Conductors instead of rendering their contents. If transmitters are causing you fps issues, this should hopefully help.", "configuration.mekanism.gear.free_runners.armored": "Armoured Free Runners", "configuration.mekanism.gear.free_runners.armored.armor": "Armour", "configuration.mekanism.gear.free_runners.armored.armor.tooltip": "Armour value of the Armoured Free Runners", diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json index 0b36a4e359a..31bdea039b5 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json @@ -827,7 +827,7 @@ "configuration.mekanism.client.sounds.player.enable.tooltip": "˙punos ᵷuᴉʞɔᴉꞁɔ uoᴉʇɐᴉpɐᴚ ǝɥʇ ᵷuᴉʎɐꞁd sʇɔǝɟɟɐ osꞁɐ sᴉɥ⟘ ˙ʇᴉu∩ ᵷuᴉʇɐꞁnpoW ꞁɐuoᴉʇɐʇᴉʌɐɹ⅁ ɹo 'ɹǝʍoɹɥʇǝɯɐꞁℲ 'ʞsɐW ɐqnɔS 'ʞɔɐdʇǝՐ ɐ ᵷuᴉsn sᴉ ɹǝʎɐꞁd ʎuɐ uǝɥʍ ɹoɟ spunos ʎɐꞁԀ", "configuration.mekanism.client.sounds.tooltip": "spunoS s,ɯsᴉuɐʞǝW ᵷuᴉɹnᵷᴉɟuoɔ ɹoɟ sᵷuᴉʇʇǝS", "configuration.mekanism.client.transmitters.opaque": "sɹǝʇʇᴉɯsuɐɹ⟘ ǝnbɐdO", - "configuration.mekanism.client.transmitters.opaque.tooltip": "˙dꞁǝɥ ʎꞁꞁnɟǝdoɥ pꞁnoɥs sᴉɥʇ 'sǝnssᴉ sdɟ noʎ ᵷuᴉsnɐɔ ǝɹɐ sɹǝʇʇᴉɯsuɐɹʇ ɟI ˙sʇuǝʇuoɔ ɹᴉǝɥʇ ᵷuᴉɹǝpuǝɹɟo pɐǝʇsuᴉ sɹoʇɔnpuoƆ ɔᴉɯɐuʎpoɯɹǝɥ⟘ puɐ 'sɹǝʇɹodsuɐɹ⟘ ꞁɐɔᴉʇsᴉᵷoꞀ 'sǝqn⟘ pǝzᴉɹnssǝɹԀ 'sǝdᴉԀ ꞁɐɔᴉuɐɥɔǝW 'sǝꞁqɐƆ ꞁɐsɹǝʌᴉu∩ ɹoɟ sǝpᴉs sɹǝpuǝɹ 'ǝnɹʇ ɟI", + "configuration.mekanism.client.transmitters.opaque.tooltip": "˙dꞁǝɥ ʎꞁꞁnɟǝdoɥ pꞁnoɥs sᴉɥʇ 'sǝnssᴉ sdɟ noʎ ᵷuᴉsnɐɔ ǝɹɐ sɹǝʇʇᴉɯsuɐɹʇ ɟI ˙sʇuǝʇuoɔ ɹᴉǝɥʇ ᵷuᴉɹǝpuǝɹ ɟo pɐǝʇsuᴉ sɹoʇɔnpuoƆ ɔᴉɯɐuʎpoɯɹǝɥ⟘ puɐ 'sɹǝʇɹodsuɐɹ⟘ ꞁɐɔᴉʇsᴉᵷoꞀ 'sǝqn⟘ pǝzᴉɹnssǝɹԀ 'sǝdᴉԀ ꞁɐɔᴉuɐɥɔǝW 'sǝꞁqɐƆ ꞁɐsɹǝʌᴉu∩ ɹoɟ sǝpᴉs sɹǝpuǝɹ 'ǝnɹʇ ɟI", "configuration.mekanism.common.copy_block_data": "ɐʇɐᗡ ʞɔoꞁᗺ ʎdoƆ", "configuration.mekanism.common.copy_block_data.tooltip": "˙pǝuɹnʇǝɹ ǝq ꞁꞁᴉʍ ʞɔɐʇs ǝɥʇ ɟo ǝɔuɐʇsuᴉ ʇꞁnɐɟǝp ǝɥʇ puɐ pǝᴉdoɔ ǝq ꞁꞁᴉʍ ɐʇɐp ou ǝsꞁɐɟ oʇ ʇǝs sᴉ sᴉɥʇ ɟI ˙ʞɔᴉꞁɔ ǝꞁppᴉɯ ᵷuᴉsn uǝɥʍ pǝᴉdoɔ sᴉ ɐʇɐp uoᴉʇɐɹnᵷᴉɟuoɔ ǝuᴉɥɔɐɯ ɹǝɥʇǝɥʍ sǝuᴉɯɹǝʇǝᗡ", "configuration.mekanism.common.decay_timers": "sɹǝɯᴉ⟘ ʎɐɔǝᗡ", diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json index 10ef20070f7..21eaa999a6f 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json @@ -828,7 +828,7 @@ "configuration.mekanism.client.sounds.player.enable.tooltip": "Play sounds for when any player is using a Jetpack, Scuba Mask, Flamethrower, or Gravitational Modulating Unit. This also affects playing the Radiation clicking sound.", "configuration.mekanism.client.sounds.tooltip": "Settings for configuring Mekanism's Sounds", "configuration.mekanism.client.transmitters.opaque": "Opaque Transmitters", - "configuration.mekanism.client.transmitters.opaque.tooltip": "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurized Tubes, Logistical Transporters, and Thermodynamic Conductors instead ofrendering their contents. If transmitters are causing you fps issues, this should hopefully help.", + "configuration.mekanism.client.transmitters.opaque.tooltip": "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurized Tubes, Logistical Transporters, and Thermodynamic Conductors instead of rendering their contents. If transmitters are causing you fps issues, this should hopefully help.", "configuration.mekanism.common.copy_block_data": "Copy Block Data", "configuration.mekanism.common.copy_block_data.tooltip": "Determines whether machine configuration data is copied when using middle click. If this is set to false no data will be copied and the default instance of the stack will be returned.", "configuration.mekanism.common.decay_timers": "Decay Timers", diff --git a/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md b/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md index e84cd807876..06b25996a04 100644 --- a/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md +++ b/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md @@ -4495,5 +4495,5 @@ methods: returns: java_type: boolean type: boolean -version: 10.7.2 +version: 10.7.4 --- diff --git a/src/datagen/generated/mekanismadditions/.cache/dfe6eafb7c0d05a49bee122125cab06c7b53ab0b b/src/datagen/generated/mekanismadditions/.cache/dfe6eafb7c0d05a49bee122125cab06c7b53ab0b index fc75b57bbac..f068a580937 100644 --- a/src/datagen/generated/mekanismadditions/.cache/dfe6eafb7c0d05a49bee122125cab06c7b53ab0b +++ b/src/datagen/generated/mekanismadditions/.cache/dfe6eafb7c0d05a49bee122125cab06c7b53ab0b @@ -1,5 +1,5 @@ -// 1.21.1 2024-08-23T14:39:19.8875449 Languages: en_us for mod: mekanismadditions +// 1.21.1 2024-08-23T17:06:58.9781515 Languages: en_us for mod: mekanismadditions d05507d12b409c92bc6460462db3bb8af9cc656e assets/mekanismadditions/lang/en_au.json d05507d12b409c92bc6460462db3bb8af9cc656e assets/mekanismadditions/lang/en_gb.json -c414a30dbea8e52685d953052a441ff9974c9602 assets/mekanismadditions/lang/en_ud.json -866737604989cf9c18f3ab0f15a3f806db617bda assets/mekanismadditions/lang/en_us.json +5a762705798a1cb436fce090142562e51d7fabf8 assets/mekanismadditions/lang/en_ud.json +fed2dd648bc9086cb5754a6793970ac0bb4eea09 assets/mekanismadditions/lang/en_us.json diff --git a/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_ud.json b/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_ud.json index 42994147d55..502017ce0c6 100644 --- a/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_ud.json +++ b/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_ud.json @@ -289,9 +289,6 @@ "configuration.mekanismadditions.server.baby.arrow_damage_multiplier": "ɹǝᴉꞁdᴉʇꞁnW ǝᵷɐɯɐᗡ ʍoɹɹⱯ", "configuration.mekanismadditions.server.baby.arrow_damage_multiplier.tooltip": "˙sqoɯ ʎqɐq ʎq ʇoɥs sʍoɹɹɐ ɟo ɹǝᴉꞁdᴉʇꞁnɯ ǝᵷɐɯɐᗡ", "configuration.mekanismadditions.server.baby.button": "sqoW ʎqɐᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.biome_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɯoᴉᗺ", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.biome_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.biome_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ pǝᵷᵷoᗺ ʎqɐᗺ ʇɐɥʇ spᴉ ǝɯoᴉq ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.cost_per_entity": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉʇuƎ ɹǝԀ ʇsoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.cost_per_entity.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds pǝᵷᵷoᗺ ʎqɐᗺ ɟo ʎʇᴉʇuǝ ɹǝd ʇsoɔ uʍɐds ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.max_cost": "ɹǝᴉꞁdᴉʇꞁnW ʇsoƆ xɐW", @@ -302,17 +299,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_bogged.min_size.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds pǝᵷᵷoᗺ ʎqɐᗺ ɟo ǝzᴉs dnoɹᵷ ɯnɯᴉuᴉɯ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.should_spawn": "uʍɐdS pꞁnoɥS", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.should_spawn.tooltip": "˙sǝᴉqɯoz ʎqɐq ʞuᴉɥ⟘ ˙pǝᵷᵷoᗺ ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ǝꞁqɐuƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.structure_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɹnʇɔnɹʇS", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.structure_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.structure_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ pǝᵷᵷoᗺ ʎqɐᗺ ʇɐɥʇ spᴉ ǝɹnʇɔnɹʇs ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.top_level": "pǝᵷᵷoᗺ ʎqɐᗺ", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.top_level.button": "sᵷuᴉʇʇǝS uʍɐdS ʇᴉpƎ", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.top_level.tooltip": "˙pǝᵷᵷoᗺ ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ᵷuᴉpɹɐᵷǝɹ suoᴉʇdo ᵷᴉɟuoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.weight": "ɹǝᴉꞁdᴉʇꞁnW ʇɥᵷᴉǝM", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.weight.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds pǝᵷᵷoᗺ ʎqɐᗺ ɟo ʇɥᵷᴉǝʍ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.biome_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɯoᴉᗺ", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.biome_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.biome_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ ɹǝdǝǝɹƆ ʎqɐᗺ ʇɐɥʇ spᴉ ǝɯoᴉq ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.cost_per_entity": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉʇuƎ ɹǝԀ ʇsoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.cost_per_entity.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds ɹǝdǝǝɹƆ ʎqɐᗺ ɟo ʎʇᴉʇuǝ ɹǝd ʇsoɔ uʍɐds ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.max_cost": "ɹǝᴉꞁdᴉʇꞁnW ʇsoƆ xɐW", @@ -323,17 +314,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_creeper.min_size.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds ɹǝdǝǝɹƆ ʎqɐᗺ ɟo ǝzᴉs dnoɹᵷ ɯnɯᴉuᴉɯ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.should_spawn": "uʍɐdS pꞁnoɥS", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.should_spawn.tooltip": "˙sǝᴉqɯoz ʎqɐq ʞuᴉɥ⟘ ˙ɹǝdǝǝɹƆ ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ǝꞁqɐuƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.structure_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɹnʇɔnɹʇS", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.structure_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.structure_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ ɹǝdǝǝɹƆ ʎqɐᗺ ʇɐɥʇ spᴉ ǝɹnʇɔnɹʇs ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.top_level": "ɹǝdǝǝɹƆ ʎqɐᗺ", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.top_level.button": "sᵷuᴉʇʇǝS uʍɐdS ʇᴉpƎ", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.top_level.tooltip": "˙ɹǝdǝǝɹƆ ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ᵷuᴉpɹɐᵷǝɹ suoᴉʇdo ᵷᴉɟuoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.weight": "ɹǝᴉꞁdᴉʇꞁnW ʇɥᵷᴉǝM", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.weight.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds ɹǝdǝǝɹƆ ʎqɐᗺ ɟo ʇɥᵷᴉǝʍ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.biome_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɯoᴉᗺ", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.biome_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.biome_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ uɐɯɹǝpuƎ ʎqɐᗺ ʇɐɥʇ spᴉ ǝɯoᴉq ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.cost_per_entity": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉʇuƎ ɹǝԀ ʇsoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.cost_per_entity.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uɐɯɹǝpuƎ ʎqɐᗺ ɟo ʎʇᴉʇuǝ ɹǝd ʇsoɔ uʍɐds ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.max_cost": "ɹǝᴉꞁdᴉʇꞁnW ʇsoƆ xɐW", @@ -344,17 +329,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_enderman.min_size.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uɐɯɹǝpuƎ ʎqɐᗺ ɟo ǝzᴉs dnoɹᵷ ɯnɯᴉuᴉɯ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.should_spawn": "uʍɐdS pꞁnoɥS", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.should_spawn.tooltip": "˙sǝᴉqɯoz ʎqɐq ʞuᴉɥ⟘ ˙uɐɯɹǝpuƎ ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ǝꞁqɐuƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.structure_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɹnʇɔnɹʇS", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.structure_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.structure_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ uɐɯɹǝpuƎ ʎqɐᗺ ʇɐɥʇ spᴉ ǝɹnʇɔnɹʇs ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.top_level": "uɐɯɹǝpuƎ ʎqɐᗺ", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.top_level.button": "sᵷuᴉʇʇǝS uʍɐdS ʇᴉpƎ", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.top_level.tooltip": "˙uɐɯɹǝpuƎ ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ᵷuᴉpɹɐᵷǝɹ suoᴉʇdo ᵷᴉɟuoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.weight": "ɹǝᴉꞁdᴉʇꞁnW ʇɥᵷᴉǝM", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.weight.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uɐɯɹǝpuƎ ʎqɐᗺ ɟo ʇɥᵷᴉǝʍ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.biome_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɯoᴉᗺ", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.biome_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.biome_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ uoʇǝꞁǝʞS ʎqɐᗺ ʇɐɥʇ spᴉ ǝɯoᴉq ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.cost_per_entity": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉʇuƎ ɹǝԀ ʇsoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.cost_per_entity.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uoʇǝꞁǝʞS ʎqɐᗺ ɟo ʎʇᴉʇuǝ ɹǝd ʇsoɔ uʍɐds ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.max_cost": "ɹǝᴉꞁdᴉʇꞁnW ʇsoƆ xɐW", @@ -365,17 +344,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.min_size.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uoʇǝꞁǝʞS ʎqɐᗺ ɟo ǝzᴉs dnoɹᵷ ɯnɯᴉuᴉɯ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.should_spawn": "uʍɐdS pꞁnoɥS", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.should_spawn.tooltip": "˙sǝᴉqɯoz ʎqɐq ʞuᴉɥ⟘ ˙uoʇǝꞁǝʞS ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ǝꞁqɐuƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.structure_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɹnʇɔnɹʇS", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.structure_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.structure_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ uoʇǝꞁǝʞS ʎqɐᗺ ʇɐɥʇ spᴉ ǝɹnʇɔnɹʇs ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.top_level": "uoʇǝꞁǝʞS ʎqɐᗺ", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.top_level.button": "sᵷuᴉʇʇǝS uʍɐdS ʇᴉpƎ", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.top_level.tooltip": "˙uoʇǝꞁǝʞS ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ᵷuᴉpɹɐᵷǝɹ suoᴉʇdo ᵷᴉɟuoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.weight": "ɹǝᴉꞁdᴉʇꞁnW ʇɥᵷᴉǝM", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.weight.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uoʇǝꞁǝʞS ʎqɐᗺ ɟo ʇɥᵷᴉǝʍ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.biome_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɯoᴉᗺ", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.biome_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.biome_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ ʎɐɹʇS ʎqɐᗺ ʇɐɥʇ spᴉ ǝɯoᴉq ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_stray.cost_per_entity": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉʇuƎ ɹǝԀ ʇsoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_stray.cost_per_entity.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds ʎɐɹʇS ʎqɐᗺ ɟo ʎʇᴉʇuǝ ɹǝd ʇsoɔ uʍɐds ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_stray.max_cost": "ɹǝᴉꞁdᴉʇꞁnW ʇsoƆ xɐW", @@ -386,17 +359,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_stray.min_size.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds ʎɐɹʇS ʎqɐᗺ ɟo ǝzᴉs dnoɹᵷ ɯnɯᴉuᴉɯ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_stray.should_spawn": "uʍɐdS pꞁnoɥS", "configuration.mekanismadditions.server.baby.spawning.baby_stray.should_spawn.tooltip": "˙sǝᴉqɯoz ʎqɐq ʞuᴉɥ⟘ ˙ʎɐɹʇS ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ǝꞁqɐuƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.structure_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɹnʇɔnɹʇS", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.structure_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.structure_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ ʎɐɹʇS ʎqɐᗺ ʇɐɥʇ spᴉ ǝɹnʇɔnɹʇs ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_stray.top_level": "ʎɐɹʇS ʎqɐᗺ", "configuration.mekanismadditions.server.baby.spawning.baby_stray.top_level.button": "sᵷuᴉʇʇǝS uʍɐdS ʇᴉpƎ", "configuration.mekanismadditions.server.baby.spawning.baby_stray.top_level.tooltip": "˙ʎɐɹʇS ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ᵷuᴉpɹɐᵷǝɹ suoᴉʇdo ᵷᴉɟuoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_stray.weight": "ɹǝᴉꞁdᴉʇꞁnW ʇɥᵷᴉǝM", "configuration.mekanismadditions.server.baby.spawning.baby_stray.weight.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds ʎɐɹʇS ʎqɐᗺ ɟo ʇɥᵷᴉǝʍ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.biome_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɯoᴉᗺ", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.biome_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.biome_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ ʇɐɥʇ spᴉ ǝɯoᴉq ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.cost_per_entity": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉʇuƎ ɹǝԀ ʇsoƆ", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.cost_per_entity.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ ɟo ʎʇᴉʇuǝ ɹǝd ʇsoɔ uʍɐds ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.max_cost": "ɹǝᴉꞁdᴉʇꞁnW ʇsoƆ xɐW", @@ -407,9 +374,6 @@ "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.min_size.tooltip": "˙qoɯ ʇꞁnpɐ ǝɥʇ oʇ pǝɹɐdɯoɔ 'suʍɐds uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ ɟo ǝzᴉs dnoɹᵷ ɯnɯᴉuᴉɯ ɹoɟ ɹǝᴉꞁdᴉʇꞁnɯ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.should_spawn": "uʍɐdS pꞁnoɥS", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.should_spawn.tooltip": "˙sǝᴉqɯoz ʎqɐq ʞuᴉɥ⟘ ˙uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ǝꞁqɐuƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.structure_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ ǝɹnʇɔnɹʇS", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.structure_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.structure_blacklist.tooltip": "˙uʍɐds uɐɔ ʇuɐᴉɹɐʌ qoɯ ꞁɐɯɹou ǝɥʇ ɟᴉ uǝʌǝ uᴉ uʍɐds ʇou ꞁꞁᴉʍ uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ ʇɐɥʇ spᴉ ǝɹnʇɔnɹʇs ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.top_level": "uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.top_level.button": "sᵷuᴉʇʇǝS uʍɐdS ʇᴉpƎ", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.top_level.tooltip": "˙uoʇǝꞁǝʞS ɹǝɥʇᴉM ʎqɐᗺ ɟo ᵷuᴉuʍɐds ǝɥʇ ᵷuᴉpɹɐᵷǝɹ suoᴉʇdo ᵷᴉɟuoƆ", diff --git a/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_us.json b/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_us.json index 3f8d48ddd69..dce76d46238 100644 --- a/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_us.json +++ b/src/datagen/generated/mekanismadditions/assets/mekanismadditions/lang/en_us.json @@ -289,9 +289,6 @@ "configuration.mekanismadditions.server.baby.arrow_damage_multiplier": "Arrow Damage Multiplier", "configuration.mekanismadditions.server.baby.arrow_damage_multiplier.tooltip": "Damage multiplier of arrows shot by baby mobs.", "configuration.mekanismadditions.server.baby.button": "Edit Baby Mobs", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.biome_blacklist": "Biome Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.biome_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.biome_blacklist.tooltip": "The list of biome ids that Baby Bogged will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.cost_per_entity": "Cost Per Entity Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.cost_per_entity.tooltip": "The multiplier for spawn cost per entity of Baby Bogged spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.max_cost": "Max Cost Multiplier", @@ -302,17 +299,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_bogged.min_size.tooltip": "The multiplier for minimum group size of Baby Bogged spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.should_spawn": "Should Spawn", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.should_spawn.tooltip": "Enable the spawning of Baby Bogged. Think baby zombies.", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.structure_blacklist": "Structure Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.structure_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_bogged.structure_blacklist.tooltip": "The list of structure ids that Baby Bogged will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.top_level": "Baby Bogged", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.top_level.button": "Edit Spawn Settings", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.top_level.tooltip": "Config options regarding the spawning of Baby Bogged.", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.weight": "Weight Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_bogged.weight.tooltip": "The multiplier for weight of Baby Bogged spawns, compared to the adult mob.", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.biome_blacklist": "Biome Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.biome_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.biome_blacklist.tooltip": "The list of biome ids that Baby Creeper will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.cost_per_entity": "Cost Per Entity Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.cost_per_entity.tooltip": "The multiplier for spawn cost per entity of Baby Creeper spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.max_cost": "Max Cost Multiplier", @@ -323,17 +314,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_creeper.min_size.tooltip": "The multiplier for minimum group size of Baby Creeper spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.should_spawn": "Should Spawn", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.should_spawn.tooltip": "Enable the spawning of Baby Creeper. Think baby zombies.", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.structure_blacklist": "Structure Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.structure_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_creeper.structure_blacklist.tooltip": "The list of structure ids that Baby Creeper will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.top_level": "Baby Creeper", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.top_level.button": "Edit Spawn Settings", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.top_level.tooltip": "Config options regarding the spawning of Baby Creeper.", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.weight": "Weight Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_creeper.weight.tooltip": "The multiplier for weight of Baby Creeper spawns, compared to the adult mob.", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.biome_blacklist": "Biome Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.biome_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.biome_blacklist.tooltip": "The list of biome ids that Baby Enderman will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.cost_per_entity": "Cost Per Entity Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.cost_per_entity.tooltip": "The multiplier for spawn cost per entity of Baby Enderman spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.max_cost": "Max Cost Multiplier", @@ -344,17 +329,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_enderman.min_size.tooltip": "The multiplier for minimum group size of Baby Enderman spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.should_spawn": "Should Spawn", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.should_spawn.tooltip": "Enable the spawning of Baby Enderman. Think baby zombies.", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.structure_blacklist": "Structure Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.structure_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_enderman.structure_blacklist.tooltip": "The list of structure ids that Baby Enderman will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.top_level": "Baby Enderman", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.top_level.button": "Edit Spawn Settings", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.top_level.tooltip": "Config options regarding the spawning of Baby Enderman.", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.weight": "Weight Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_enderman.weight.tooltip": "The multiplier for weight of Baby Enderman spawns, compared to the adult mob.", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.biome_blacklist": "Biome Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.biome_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.biome_blacklist.tooltip": "The list of biome ids that Baby Skeleton will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.cost_per_entity": "Cost Per Entity Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.cost_per_entity.tooltip": "The multiplier for spawn cost per entity of Baby Skeleton spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.max_cost": "Max Cost Multiplier", @@ -365,17 +344,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.min_size.tooltip": "The multiplier for minimum group size of Baby Skeleton spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.should_spawn": "Should Spawn", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.should_spawn.tooltip": "Enable the spawning of Baby Skeleton. Think baby zombies.", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.structure_blacklist": "Structure Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.structure_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.structure_blacklist.tooltip": "The list of structure ids that Baby Skeleton will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.top_level": "Baby Skeleton", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.top_level.button": "Edit Spawn Settings", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.top_level.tooltip": "Config options regarding the spawning of Baby Skeleton.", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.weight": "Weight Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_skeleton.weight.tooltip": "The multiplier for weight of Baby Skeleton spawns, compared to the adult mob.", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.biome_blacklist": "Biome Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.biome_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.biome_blacklist.tooltip": "The list of biome ids that Baby Stray will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_stray.cost_per_entity": "Cost Per Entity Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_stray.cost_per_entity.tooltip": "The multiplier for spawn cost per entity of Baby Stray spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_stray.max_cost": "Max Cost Multiplier", @@ -386,17 +359,11 @@ "configuration.mekanismadditions.server.baby.spawning.baby_stray.min_size.tooltip": "The multiplier for minimum group size of Baby Stray spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_stray.should_spawn": "Should Spawn", "configuration.mekanismadditions.server.baby.spawning.baby_stray.should_spawn.tooltip": "Enable the spawning of Baby Stray. Think baby zombies.", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.structure_blacklist": "Structure Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.structure_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_stray.structure_blacklist.tooltip": "The list of structure ids that Baby Stray will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_stray.top_level": "Baby Stray", "configuration.mekanismadditions.server.baby.spawning.baby_stray.top_level.button": "Edit Spawn Settings", "configuration.mekanismadditions.server.baby.spawning.baby_stray.top_level.tooltip": "Config options regarding the spawning of Baby Stray.", "configuration.mekanismadditions.server.baby.spawning.baby_stray.weight": "Weight Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_stray.weight.tooltip": "The multiplier for weight of Baby Stray spawns, compared to the adult mob.", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.biome_blacklist": "Biome Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.biome_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.biome_blacklist.tooltip": "The list of biome ids that Baby Wither Skeleton will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.cost_per_entity": "Cost Per Entity Multiplier", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.cost_per_entity.tooltip": "The multiplier for spawn cost per entity of Baby Wither Skeleton spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.max_cost": "Max Cost Multiplier", @@ -407,9 +374,6 @@ "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.min_size.tooltip": "The multiplier for minimum group size of Baby Wither Skeleton spawns, compared to the adult mob.", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.should_spawn": "Should Spawn", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.should_spawn.tooltip": "Enable the spawning of Baby Wither Skeleton. Think baby zombies.", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.structure_blacklist": "Structure Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.structure_blacklist.button": "Edit Blacklist", - "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.structure_blacklist.tooltip": "The list of structure ids that Baby Wither Skeleton will not spawn in even if the normal mob variant can spawn.", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.top_level": "Baby Wither Skeleton", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.top_level.button": "Edit Spawn Settings", "configuration.mekanismadditions.server.baby.spawning.baby_wither_skeleton.top_level.tooltip": "Config options regarding the spawning of Baby Wither Skeleton.", diff --git a/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd b/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd index 8aa2398c986..2d37dacde82 100644 --- a/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd +++ b/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd @@ -1,5 +1,5 @@ -// 1.21.1 2024-08-23T14:39:20.0240591 Languages: en_us for mod: mekanismgenerators +// 1.21.1 2024-08-23T17:24:34.4599421 Languages: en_us for mod: mekanismgenerators b934b9aafaf6b98813ecd472c8a8f012383b4aa0 assets/mekanismgenerators/lang/en_au.json b934b9aafaf6b98813ecd472c8a8f012383b4aa0 assets/mekanismgenerators/lang/en_gb.json -1990c973d540880252ea4596d18a8f4f24345404 assets/mekanismgenerators/lang/en_ud.json -f15b18828958be7c22fda6e3f3860e23d39c343d assets/mekanismgenerators/lang/en_us.json +ff07046efc0743fcef50a9decdf7b5764990474c assets/mekanismgenerators/lang/en_ud.json +e7bf6e6f698aa975da87cb3c80cdb134ac01ae65 assets/mekanismgenerators/lang/en_us.json diff --git a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json index 3c1966face3..aa8e7cd2c91 100644 --- a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json +++ b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json @@ -139,9 +139,6 @@ "configuration.mekanismgenerators.server.generator.solar.tooltip": "sɹoʇɐɹǝuǝ⅁ ɹɐꞁoS ᵷuᴉɹnᵷᴉɟuoɔ ɹoɟ sᵷuᴉʇʇǝS", "configuration.mekanismgenerators.server.generator.wind": "ɹoʇɐɹǝuǝ⅁ puᴉM", "configuration.mekanismgenerators.server.generator.wind.button": "ɹoʇɐɹǝuǝ⅁ puᴉM ʇᴉpƎ", - "configuration.mekanismgenerators.server.generator.wind.dimension_blacklist": "ʇsᴉꞁʞɔɐꞁᗺ uoᴉsuǝɯᴉᗡ", - "configuration.mekanismgenerators.server.generator.wind.dimension_blacklist.button": "ʇsᴉꞁʞɔɐꞁᗺ ʇᴉpƎ", - "configuration.mekanismgenerators.server.generator.wind.dimension_blacklist.tooltip": "˙uᴉ ɹǝʍod ǝʇɐɹǝuǝᵷ ʇou ꞁꞁᴉʍ ɹoʇɐɹǝuǝ⅁ puᴉM ǝɥʇ ʇɐɥʇ spᴉ uoᴉsuǝɯᴉp ɟo ʇsᴉꞁ ǝɥ⟘", "configuration.mekanismgenerators.server.generator.wind.gen.max": "uoᴉʇɐɹǝuǝ⅁ ʎᵷɹǝuƎ xɐW", "configuration.mekanismgenerators.server.generator.wind.gen.max.height": "ǝnꞁɐΛ ⅄ xɐW", "configuration.mekanismgenerators.server.generator.wind.gen.max.height.tooltip": "˙8ᘔ⥝ ʇɐ pǝdɯɐꞁɔ ǝq pꞁnoʍ sᴉɥʇ 'sʞɔoꞁq 8ᘔ⥝ ʇɐ ᵷuᴉꞁᴉǝɔ ɐ ǝʌɐɥ ʇnq 'ꞁꞁɐʇ sʞɔoꞁq 9ϛᘔ ǝɹɐ ʇɐɥʇ ɹǝɥʇǝu ǝɥʇ ǝʞᴉꞁ spꞁɹoʍ ɹoɟ ǝꞁdɯɐxǝ ɹoℲ ˙ʇɥᵷᴉǝɥ ꞁɐɔᴉᵷoꞁ s,pꞁɹoʍ ǝɥʇ ʇɐ pǝdɯɐꞁɔ sʇǝᵷ ǝnꞁɐʌ sᴉɥ⟘ ˙uoᴉʇɐɹǝuǝᵷ ɹǝʍoԀ sɹoʇɐɹǝuǝ⅁ puᴉM ǝɥʇ sʇɔǝɟɟɐ ʇɐɥʇ ǝnꞁɐʌ ⅄ ɯnɯᴉxɐɯ ǝɥ⟘", diff --git a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json index 4761b5ff735..006074be5f0 100644 --- a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json +++ b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json @@ -139,9 +139,6 @@ "configuration.mekanismgenerators.server.generator.solar.tooltip": "Settings for configuring Solar Generators", "configuration.mekanismgenerators.server.generator.wind": "Wind Generator", "configuration.mekanismgenerators.server.generator.wind.button": "Edit Wind Generator", - "configuration.mekanismgenerators.server.generator.wind.dimension_blacklist": "Dimension Blacklist", - "configuration.mekanismgenerators.server.generator.wind.dimension_blacklist.button": "Edit Blacklist", - "configuration.mekanismgenerators.server.generator.wind.dimension_blacklist.tooltip": "The list of dimension ids that the Wind Generator will not generate power in.", "configuration.mekanismgenerators.server.generator.wind.gen.max": "Max Energy Generation", "configuration.mekanismgenerators.server.generator.wind.gen.max.height": "Max Y Value", "configuration.mekanismgenerators.server.generator.wind.gen.max.height.tooltip": "The maximum Y value that affects the Wind Generators Power generation. This value gets clamped at the world's logical height. For example for worlds like the nether that are 256 blocks tall, but have a ceiling at 128 blocks, this would be clamped at 128.", diff --git a/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java b/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java index d1e5754366f..2a036e2da90 100644 --- a/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java +++ b/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java @@ -13,11 +13,11 @@ import mekanism.common.registration.impl.ItemRegistryObject; import mekanism.common.registration.impl.SlurryRegistryObject; import mekanism.common.registries.MekanismBlocks; +import mekanism.common.registries.MekanismChemicals; import mekanism.common.registries.MekanismDamageTypes; import mekanism.common.registries.MekanismEntityTypes; import mekanism.common.registries.MekanismFluids; import mekanism.common.registries.MekanismGameEvents; -import mekanism.common.registries.MekanismChemicals; import mekanism.common.registries.MekanismItems; import mekanism.common.resource.BlockResourceInfo; import mekanism.common.resource.IResource; diff --git a/src/generators/java/mekanism/generators/client/model/ModelWindGenerator.java b/src/generators/java/mekanism/generators/client/model/ModelWindGenerator.java index 7a8782676ca..62b560d59dc 100644 --- a/src/generators/java/mekanism/generators/client/model/ModelWindGenerator.java +++ b/src/generators/java/mekanism/generators/client/model/ModelWindGenerator.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import org.jetbrains.annotations.NotNull; public class ModelWindGenerator extends MekanismJavaModel { @@ -134,7 +135,7 @@ public ModelWindGenerator(EntityModelSet entityModelSet) { bladeCenter = BLADE_CENTER.getFromRoot(root); } - public void render(@NotNull PoseStack matrix, @NotNull MultiBufferSource renderer, double angle, int light, int overlayLight, boolean hasEffect) { + public void render(@NotNull PoseStack matrix, @NotNull MultiBufferSource renderer, float angle, int light, int overlayLight, boolean hasEffect) { float baseRotation = getAbsoluteRotation(angle); setRotation(blade1a, 0F, 0F, baseRotation); setRotation(blade1b, 0F, 0F, 0.0349066F + baseRotation); @@ -158,7 +159,7 @@ public void renderToBuffer(@NotNull PoseStack poseStack, @NotNull VertexConsumer renderPartsToBuffer(parts, poseStack, vertexConsumer, light, overlayLight, color); } - public void renderWireFrame(PoseStack matrix, VertexConsumer vertexBuilder, double angle) { + public void renderWireFrame(PoseStack matrix, VertexConsumer vertexBuilder, float angle) { float baseRotation = getAbsoluteRotation(angle); setRotation(blade1a, 0F, 0F, baseRotation); setRotation(blade1b, 0F, 0F, 0.0349066F + baseRotation); @@ -176,7 +177,7 @@ public void renderWireFrame(PoseStack matrix, VertexConsumer vertexBuilder, doub renderPartsAsWireFrame(parts, matrix, vertexBuilder); } - private float getAbsoluteRotation(double angle) { - return (float) Math.toRadians(angle % 360); + private float getAbsoluteRotation(float angle) { + return (angle % 360) * Mth.DEG_TO_RAD; } } \ No newline at end of file diff --git a/src/generators/java/mekanism/generators/client/render/RenderWindGenerator.java b/src/generators/java/mekanism/generators/client/render/RenderWindGenerator.java index b3c187182e3..e178498a636 100644 --- a/src/generators/java/mekanism/generators/client/render/RenderWindGenerator.java +++ b/src/generators/java/mekanism/generators/client/render/RenderWindGenerator.java @@ -26,7 +26,7 @@ public RenderWindGenerator(BlockEntityRendererProvider.Context context) { @Override protected void render(TileEntityWindGenerator tile, float partialTick, PoseStack matrix, MultiBufferSource renderer, int light, int overlayLight, ProfilerFiller profiler) { - double angle = setupRenderer(tile, partialTick, matrix); + float angle = setupRenderer(tile, partialTick, matrix); model.render(matrix, renderer, angle, light, overlayLight, false); matrix.popPose(); } @@ -51,18 +51,18 @@ public AABB getRenderBoundingBox(TileEntityWindGenerator tile) { @Override public void renderWireFrame(BlockEntity tile, float partialTick, PoseStack matrix, VertexConsumer buffer) { if (tile instanceof TileEntityWindGenerator windGenerator) { - double angle = setupRenderer(windGenerator, partialTick, matrix); + float angle = setupRenderer(windGenerator, partialTick, matrix); model.renderWireFrame(matrix, buffer, angle); matrix.popPose(); } } - private double setupRenderer(TileEntityWindGenerator tile, float partialTick, PoseStack matrix) { + private float setupRenderer(TileEntityWindGenerator tile, float partialTick, PoseStack matrix) { matrix.pushPose(); matrix.translate(0.5, 1.5, 0.5); MekanismRenderer.rotate(matrix, tile.getDirection(), 0, 180, 90, 270); matrix.mulPose(Axis.ZP.rotationDegrees(180)); - double angle = tile.getAngle(); + float angle = tile.getAngle(); if (tile.getActive() && partialTick > 0) { angle = (angle + tile.getHeightSpeedRatio() * partialTick) % 360; } diff --git a/src/generators/java/mekanism/generators/client/render/item/RenderWindGeneratorItem.java b/src/generators/java/mekanism/generators/client/render/item/RenderWindGeneratorItem.java index 15088d0aa03..e4c072a3030 100644 --- a/src/generators/java/mekanism/generators/client/render/item/RenderWindGeneratorItem.java +++ b/src/generators/java/mekanism/generators/client/render/item/RenderWindGeneratorItem.java @@ -2,14 +2,12 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import java.util.List; +import mekanism.api.MekanismAPITags; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.item.MekanismISTER; import mekanism.generators.client.model.ModelWindGenerator; -import mekanism.generators.common.config.MekanismGeneratorsConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -33,17 +31,17 @@ public void renderByItem(@NotNull ItemStack stack, @NotNull ItemDisplayContext d int light, int overlayLight) { Minecraft minecraft = Minecraft.getInstance(); boolean tickingNormally = MekanismRenderer.isRunningNormally(); - if (tickingNormally) { - int ticks = Minecraft.getInstance().levelRenderer.getTicks(); - if (lastTicksUpdated != ticks) { - //Only update the angle if we are in a world and that world is not blacklisted - if (minecraft.level != null) { - List blacklistedDimensions = MekanismGeneratorsConfig.generators.windGenerationDimBlacklist.get(); - if (blacklistedDimensions.isEmpty() || !blacklistedDimensions.contains(minecraft.level.dimension().location())) { - angle = (angle + SPEED) % 360; - } + if (tickingNormally && minecraft.level != null) { + //Only update the angle if we are in a world and that world is not blacklisted + if (minecraft.level.dimensionTypeRegistration().is(MekanismAPITags.DimensionTypes.NO_WIND)) { + //If the dimension is blacklisted, don't try to tick it at all + tickingNormally = false; + } else { + int ticks = Minecraft.getInstance().levelRenderer.getTicks(); + if (lastTicksUpdated != ticks) { + angle = (angle + SPEED) % 360; + lastTicksUpdated = ticks; } - lastTicksUpdated = ticks; } } float renderAngle = angle; diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index 6eabf950bea..b7c1570a834 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -6,12 +6,10 @@ import mekanism.common.config.value.CachedFloatValue; import mekanism.common.config.value.CachedIntValue; import mekanism.common.config.value.CachedLongValue; -import mekanism.common.config.value.CachedResourceLocationListValue; import mekanism.common.util.EnumUtils; import mekanism.generators.common.content.fission.FissionReactorMultiblockData; import mekanism.generators.common.content.fusion.FusionReactorMultiblockData; import net.minecraft.SharedConstants; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.dimension.DimensionType; import net.neoforged.fml.config.ModConfig.Type; import net.neoforged.neoforge.common.ModConfigSpec; @@ -49,7 +47,6 @@ public class GeneratorsConfig extends BaseMekanismConfig { public final CachedLongValue windGenerationMax; public final CachedIntValue windGenerationMinY; public final CachedIntValue windGenerationMaxY; - public final CachedResourceLocationListValue windGenerationDimBlacklist; public final CachedLongValue energyPerFissionFuel; public final CachedDoubleValue fissionCasingHeatCapacity; @@ -131,10 +128,6 @@ public class GeneratorsConfig extends BaseMekanismConfig { // as it is just used for range clamping windGenerationMaxY = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_GEN_MAX_Y.applyToBuilder(builder) .define("maxY", DimensionType.MAX_Y, value -> value instanceof Integer && (Integer) value > windGenerationMinY.getOrDefault())); - //Note: We cannot verify the dimension exists as dimensions are dynamic so may not actually exist when we are validating - //TODO - 1.21: Re-evaluate some of these blacklist configs and maybe move them over to using tags - windGenerationDimBlacklist = CachedResourceLocationListValue.define(this, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_DIM_BLACKLIST.applyToBuilder(builder), - "dimensionBlacklist", ResourceLocation.withDefaultNamespace("the_end")); builder.pop(); GeneratorsConfigTranslations.SERVER_TURBINE.applyToBuilder(builder).push("turbine"); diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java index 0042364602f..4980ee59a66 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java @@ -49,8 +49,6 @@ public enum GeneratorsConfigTranslations implements IConfigTranslation { SERVER_GENERATOR_WIND_GEN_MAX_Y("server.generator.wind.gen.max.height", "Max Y Value", "The maximum Y value that affects the Wind Generators Power generation. This value gets clamped at the world's logical height. For example for worlds like " + "the nether that are 256 blocks tall, but have a ceiling at 128 blocks, this would be clamped at 128."), - SERVER_GENERATOR_WIND_DIM_BLACKLIST("server.generator.wind.dimension_blacklist", "Dimension Blacklist", - "The list of dimension ids that the Wind Generator will not generate power in.", "Edit Blacklist"), SERVER_TURBINE("server.turbine", "Industrial Turbine", "Settings for configuring Industrial Turbines", "Edit Turbine Settings"), SERVER_TURBINE_BLADES("server.turbine.blades", "Blades Per Coil", "The number of Turbine Blades supported by each Electromagnetic Coil."), diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 76054b6fb42..34b391abecf 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -3,6 +3,7 @@ import mekanism.api.Action; import mekanism.api.AutomationType; import mekanism.api.IContentsListener; +import mekanism.api.MekanismAPITags; import mekanism.api.RelativeSide; import mekanism.api.math.MathUtils; import mekanism.common.capabilities.holder.slot.IInventorySlotHolder; @@ -29,7 +30,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou private static final float SPEED = 32F; private static final RelativeSide[] ENERGY_SIDES = {RelativeSide.FRONT, RelativeSide.BOTTOM}; - private double angle; + private float angle; private double currentMultiplier = 0; private boolean isBlacklistDimension; @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getEnergyItem", docPlaceholder = "energy item slot") @@ -123,7 +124,7 @@ public void setLevel(@NotNull Level world) { // Check the blacklist and force an update if we're in the blacklist. Otherwise, we'll never send // an initial activity status and the client (in MP) will show the windmills turning while not // generating any power - isBlacklistDimension = MekanismGeneratorsConfig.generators.windGenerationDimBlacklist.get().contains(world.dimension().location()); + isBlacklistDimension = world.dimensionTypeRegistration().is(MekanismAPITags.DimensionTypes.NO_WIND); if (isBlacklistDimension) { setActive(false); } @@ -133,7 +134,7 @@ public double getCurrentMultiplier() { return currentMultiplier; } - public double getAngle() { + public float getAngle() { return angle; } diff --git a/src/main/java/mekanism/common/config/MekanismConfigTranslations.java b/src/main/java/mekanism/common/config/MekanismConfigTranslations.java index 6f32d14b1d5..b31a6f10cb8 100644 --- a/src/main/java/mekanism/common/config/MekanismConfigTranslations.java +++ b/src/main/java/mekanism/common/config/MekanismConfigTranslations.java @@ -40,7 +40,7 @@ public enum MekanismConfigTranslations implements IConfigTranslation { CLIENT_RENDERING("client.rendering", "Rendering Settings", "Settings for adjusting how Mekanism render's certain blocks and how many particles Mekanism adds.", true), CLIENT_OPAQUE_TRANSMITTERS("client.transmitters.opaque", "Opaque Transmitters", - "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurized Tubes, Logistical Transporters, and Thermodynamic Conductors instead of" + "If true, renders sides for Universal Cables, Mechanical Pipes, Pressurized Tubes, Logistical Transporters, and Thermodynamic Conductors instead of " + "rendering their contents. If transmitters are causing you fps issues, this should hopefully help."), CLIENT_BE_RENDER_RANGE("client.render_range.block_entity", "BE Render Range", "Range at which Block Entity Renderer's added by Mekanism can render at, for example the contents of multiblocks. Vanilla defaults the rendering range for " diff --git a/src/main/java/mekanism/common/config/value/CachedResourceLocationListValue.java b/src/main/java/mekanism/common/config/value/CachedResourceLocationListValue.java deleted file mode 100644 index 7e4ea4e68ac..00000000000 --- a/src/main/java/mekanism/common/config/value/CachedResourceLocationListValue.java +++ /dev/null @@ -1,52 +0,0 @@ -package mekanism.common.config.value; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.function.Supplier; -import mekanism.common.config.IMekanismConfig; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.common.ModConfigSpec; -import net.neoforged.neoforge.common.ModConfigSpec.ConfigValue; -import org.jetbrains.annotations.NotNull; - -public class CachedResourceLocationListValue extends CachedResolvableConfigValue, List> { - - private static final Supplier> EMPTY = ArrayList::new; - - private CachedResourceLocationListValue(IMekanismConfig config, ConfigValue> internal) { - super(config, internal); - } - - public static CachedResourceLocationListValue define(IMekanismConfig config, ModConfigSpec.Builder builder, String path, ResourceLocation exampleElement) { - return new CachedResourceLocationListValue(config, builder.defineListAllowEmpty(path, EMPTY, exampleElement::toString, - o -> o instanceof String string && ResourceLocation.tryParse(string.toLowerCase(Locale.ROOT)) != null)); - } - - public static CachedResourceLocationListValue define(IMekanismConfig config, ModConfigSpec.Builder builder, String path, ResourceLocation exampleElement, - Predicate<@NotNull ResourceLocation> rlValidator) { - return new CachedResourceLocationListValue(config, builder.defineListAllowEmpty(path, EMPTY, exampleElement::toString, o -> { - if (o instanceof String string) { - ResourceLocation rl = ResourceLocation.tryParse(string.toLowerCase(Locale.ROOT)); - if (rl != null) { - return rlValidator.test(rl); - } - } - return false; - })); - } - - @Override - protected List resolve(List encoded) { - //We ignore any strings that are invalid resource locations - // validation should have happened before we got here, but in case something went wrong we don't want to crash and burn - return encoded.stream().map(s -> ResourceLocation.tryParse(s.toLowerCase(Locale.ROOT))).filter(Objects::nonNull).toList(); - } - - @Override - protected List encode(List values) { - return values.stream().map(ResourceLocation::toString).toList(); - } -} \ No newline at end of file