diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarth.java b/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarth.java
index c194ce0cc8..861c9d9149 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarth.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarth.java
@@ -1,12 +1,12 @@
package net.sevenstars.middleearth;
import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.minecraft.util.Identifier;
import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.api.utils.ModLogger;
import net.sevenstars.middleearth.block.registration.*;
import net.sevenstars.middleearth.commands.CommandRegistryME;
-import net.sevenstars.middleearth.config.ClientConfigME;
import net.sevenstars.middleearth.config.ServerConfigME;
import net.sevenstars.middleearth.enchantments.EnchantmentsME;
import net.sevenstars.middleearth.entity.EntitiesME;
@@ -43,12 +43,12 @@
import net.sevenstars.middleearth.world.spawners.EntitySpawningME;
public class MiddleEarth implements ModInitializer {
- public static final String MOD_ID = "middle-earth";
- public static final String OLD_MOD_ID = "me";
- public static final String MOD_VERSION = "1.0.0-1.21.8-beta";
+ private static final String MOD_ID = "middle-earth";
+ private static final String OLD_MOD_ID = "me";
+ private static final String MOD_VERSION = "1.0.0-1.21.8-beta";
public static final boolean IS_DEBUG = true;
public static final boolean ENABLE_INSTANT_BOOTING = true;
- public static final ModLogger LOGGER = new ModLogger(MOD_ID, IS_DEBUG);
+ public static final ModLogger LOGGER = new ModLogger(getModId(), IS_DEBUG);
@Override
public void onInitialize() {
@@ -59,8 +59,12 @@ public void onInitialize() {
ServerNetworkHandlerME.register(new ConnectionToClient());
EventRegistryME.register();
- ServerConfigME.registerConfigs();
- ClientConfigME.registerConfigs();
+
+ // register on server start
+ // *** FABRIC EVENT ***
+ ServerLifecycleEvents.SERVER_STARTING.register(
+ server -> ServerConfigME.registerConfigs()
+ );
AtlasesME.registerAtlas();
RecipesME.registerRecipes();
@@ -141,36 +145,68 @@ public void onInitialize() {
}
}
+ // Getter & Setter
+ public static String getModId() {
+ return MiddleEarth.MOD_ID;
+ }
+
+ public static String getOldModId() {
+ return MiddleEarth.OLD_MOD_ID;
+ }
+ public static String getModVersion() {
+ return MiddleEarth.MOD_VERSION;
+ }
+
// Logger
public static void logRegistryMsg(String registry) {
- LOGGER.logDebugMsg("Registering Mod " + registry + " for " + MOD_ID);
+ LOGGER.logDebugMsg("Registering Mod " + registry + " for " + getModId());
}
+
// Identifiers
+ public static Identifier id(String namespace, String path) {
+ return IdentifierUtil.build(namespace, path);
+ }
+
+ /**
+ * MiddleEarth.id(path) = MiddleEarth.id(path)
+ */
public static Identifier id(String path){
- return IdentifierUtil.build(MOD_ID, path);
+ return id(getModId(), path);
+ }
+
+ public static Identifier idOld(String path){
+ return id(getOldModId(), path);
}
+
public static Identifier idFilePath(String... names){
- return IdentifierUtil.build(MOD_ID, stringAggregate('/', names));
+ return IdentifierUtil.build(getModId(), stringAggregate('/', names));
}
+
public static Identifier idVanilla(String... names){
return IdentifierUtil.ofVanilla(stringAggregate('/', names));
}
+
public static Identifier idAggregate(String... names){
- return IdentifierUtil.buildAggregate(MOD_ID, names);
+ return IdentifierUtil.buildAggregate(getModId(), names);
}
+
public static String stringAggregate(char delimiter, String... names){
return IdentifierUtil.createAggregateValue(delimiter, names);
}
+
public static Identifier idAggregate(char delimiter, String... names){
- return IdentifierUtil.build(MOD_ID, IdentifierUtil.createAggregateValue(delimiter, names));
+ return IdentifierUtil.build(getModId(), IdentifierUtil.createAggregateValue(delimiter, names));
}
+
public static Identifier ofId(String stringId){
return IdentifierUtil.getIdentifierFromString(stringId);
}
+
public static Identifier appendSuffix(Identifier base, String suffix) {
String id = base.toString();
return Identifier.of(id + suffix);
}
+
public static Identifier appendPrefix(Identifier base, Identifier prefixId) {
if(base == null)
return null;
@@ -178,14 +214,42 @@ public static Identifier appendPrefix(Identifier base, Identifier prefixId) {
}
// Translation Keys
- public static String rawTranslationKey(LangCategory category, String value){
- return category.Prefix + "." + value;
+ // for Identifier value
+ public static String rawTranslationKey(String prefix, Identifier value){
+ return value.toTranslationKey(prefix);
}
public static String rawTranslationKey(LangCategory category, Identifier value){
- return value.toTranslationKey(category.Prefix);
+ return rawTranslationKey(category.Prefix, value);
}
+
+ // for String value
public static String rawTranslationKey(String prefix, String value){
- return prefix + "." + value;
+ if ("".equals(value)) {
+ return prefix;
+ }
+ return prefix + "." + value;
+ }
+ public static String rawTranslationKeyWithModId(String prefix, String value){
+ return rawTranslationKey(prefix + "." + getModId(), value);
+ }
+
+ public static String rawTranslationKey(LangCategory category, String value){
+ return rawTranslationKey(category.Prefix, value);
+ }
+
+ /**
+ *
Most common use,
+ *
to replace the string inside the Text.translatable()
+ *
+ *
Example:
+ *
Text.translatable("some_category." + MOD_ID + ".something_else")
+ *
->
+ *
Text.translatable(
+ *
MiddleEarth.rawTranslationKeyWithModId(LangCategory.SOME, "something_else")
+ *
)
+ */
+ public static String rawTranslationKeyWithModId(LangCategory category, String value){
+ return rawTranslationKey(category.Prefix + "." + getModId(), value);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarthClient.java b/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarthClient.java
index 1dd1738db7..0101de89e6 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarthClient.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarthClient.java
@@ -1,6 +1,7 @@
package net.sevenstars.middleearth;
import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.model.loading.v1.ExtraModelKey;
import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
import net.fabricmc.fabric.api.client.model.loading.v1.SimpleUnbakedExtraModel;
@@ -17,10 +18,13 @@
import net.minecraft.client.render.entity.model.EntityModelLayer;
import net.minecraft.client.render.item.model.special.SpecialModelTypes;
import net.minecraft.client.render.item.property.bool.BooleanProperties;
-import net.minecraft.util.Identifier;
+import net.minecraft.client.resource.language.I18n;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.block.registration.*;
import net.sevenstars.middleearth.block.special.bellows.BellowsBlockEntityRenderer;
import net.sevenstars.middleearth.block.special.coffers.*;
+import net.sevenstars.middleearth.config.ClientConfigME;
+import net.sevenstars.middleearth.config.ServerConfigME;
import net.sevenstars.middleearth.block.special.fire_of_orthanc.FireOfOrthancEntityRenderer;
import net.sevenstars.middleearth.block.special.forge.ForgeEntityRenderer;
import net.sevenstars.middleearth.block.special.plate.PlateEntityRenderer;
@@ -90,19 +94,21 @@
public class MiddleEarthClient implements ClientModInitializer {
- public static final EntityModelLayer CUSTOM_ARMOR_HELMET = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "_1");
- public static final EntityModelLayer CUSTOM_ARMOR_CHESTPLATE = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "_2");
- public static final EntityModelLayer CUSTOM_ARMOR_LEGGINGS = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "_3");
- public static final EntityModelLayer CUSTOM_ARMOR_BOOTS = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "_4");
- public static final EntityModelLayer HELMET_ADDON_MODEL_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "helmet_addon");
- public static final EntityModelLayer BACK_ATTACHMENT_MODEL_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "back_attachment");
- public static final EntityModelLayer HELMET_ATTACHMENT_MODEL_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "armor"), "helmet_attachment");
+ public static final EntityModelLayer CUSTOM_ARMOR_HELMET = new EntityModelLayer(MiddleEarth.id("armor"), "_1");
+ public static final EntityModelLayer CUSTOM_ARMOR_CHESTPLATE = new EntityModelLayer(MiddleEarth.id("armor"), "_2");
+ public static final EntityModelLayer CUSTOM_ARMOR_LEGGINGS = new EntityModelLayer(MiddleEarth.id("armor"), "_3");
+ public static final EntityModelLayer CUSTOM_ARMOR_BOOTS = new EntityModelLayer(MiddleEarth.id("armor"), "_4");
+ public static final EntityModelLayer HELMET_ADDON_MODEL_LAYER = new EntityModelLayer(MiddleEarth.id("armor"), "helmet_addon");
+ public static final EntityModelLayer BACK_ATTACHMENT_MODEL_LAYER = new EntityModelLayer(MiddleEarth.id("armor"), "back_attachment");
+ public static final EntityModelLayer HELMET_ATTACHMENT_MODEL_LAYER = new EntityModelLayer(MiddleEarth.id("armor"), "helmet_attachment");
- public static final EntityModelLayer HEATER_SHIELD_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "heater_shield"), "main");
- public static final EntityModelLayer KITE_SHIELD_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "kite_shield"), "main");
- public static final EntityModelLayer ROUND_SHIELD_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "round_shield"), "main");
+ public static final EntityModelLayer HEATER_SHIELD_LAYER = new EntityModelLayer(MiddleEarth.id("heater_shield"), "main");
+ public static final EntityModelLayer KITE_SHIELD_LAYER = new EntityModelLayer(MiddleEarth.id("kite_shield"), "main");
+ public static final EntityModelLayer ROUND_SHIELD_LAYER = new EntityModelLayer(MiddleEarth.id("round_shield"), "main");
- public static final EntityModelLayer HELD_BANNER_LAYER = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, "held_banner"), "main");
+ public static final EntityModelLayer HELD_BANNER_LAYER = new EntityModelLayer(MiddleEarth.id("held_banner"), "main");
+
+ private static boolean configsRegistered = false;
@Override
public void onInitializeClient() {
@@ -110,6 +116,16 @@ public void onInitializeClient() {
KeyInputHandler.register();
+ // config are only generated AFTER the client language files loaded
+ // TODO: there might be a better way for this
+ ClientTickEvents.END_CLIENT_TICK.register(client -> {
+ if (!configsRegistered && I18n.hasTranslation(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.section.title"))) {
+ configsRegistered = true;
+ ServerConfigME.registerConfigs();
+ ClientConfigME.registerConfigs();
+ }
+ });
+
EntityModelsME.getModels();
BooleanProperties.ID_MAPPER.put(MiddleEarth.id("sneak_attack"), SneakAttackProperty.CODEC);
BooleanProperties.ID_MAPPER.put(MiddleEarth.id("hot_component"), HotComponentProperty.CODEC);
@@ -188,11 +204,11 @@ public void onInitializeClient() {
EntityModelLayerRegistry.registerModelLayer(HELD_BANNER_LAYER, HeldBannerEntityModel::getTexturedModelData);
- SpecialModelTypes.ID_MAPPER.put(Identifier.of(MiddleEarth.MOD_ID, "held_banner"), HeldBannerModelRenderer.Unbaked.CODEC);
+ SpecialModelTypes.ID_MAPPER.put(MiddleEarth.id("held_banner"), HeldBannerModelRenderer.Unbaked.CODEC);
- SpecialModelTypes.ID_MAPPER.put(Identifier.of(MiddleEarth.MOD_ID, "heater_shield"), HeaterShieldModelRenderer.Unbaked.CODEC);
- SpecialModelTypes.ID_MAPPER.put(Identifier.of(MiddleEarth.MOD_ID, "kite_shield"), KiteShieldModelRenderer.Unbaked.CODEC);
- SpecialModelTypes.ID_MAPPER.put(Identifier.of(MiddleEarth.MOD_ID, "round_shield"), RoundShieldModelRenderer.Unbaked.CODEC);
+ SpecialModelTypes.ID_MAPPER.put(MiddleEarth.id("heater_shield"), HeaterShieldModelRenderer.Unbaked.CODEC);
+ SpecialModelTypes.ID_MAPPER.put(MiddleEarth.id("kite_shield"), KiteShieldModelRenderer.Unbaked.CODEC);
+ SpecialModelTypes.ID_MAPPER.put(MiddleEarth.id("round_shield"), RoundShieldModelRenderer.Unbaked.CODEC);
for(ArmorModelsME.CustomHelmetModels model : ArmorModelsME.CustomHelmetModels.values()){
ArmorRenderer.register(new HelmetArmorRenderer(model.getModel()), model.getItem());
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockEntityRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockEntityRegistryME.java
index 391dde440a..1754275208 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockEntityRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockEntityRegistryME.java
@@ -111,7 +111,7 @@ public static void registerBlockEntities() {
private static BlockEntityType register(String name,
FabricBlockEntityTypeBuilder.Factory entityFactory,
Block... blocks) {
- Identifier id = Identifier.of(MiddleEarth.MOD_ID, name);
+ Identifier id = MiddleEarth.id(name);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.BLOCK_ENTITY_TYPE, name));
return Registry.register(Registries.BLOCK_ENTITY_TYPE, id, FabricBlockEntityTypeBuilder.create(entityFactory, blocks).build());
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockRegistryME.java
index fd880727c9..98ff3ab8c7 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/BlockRegistryME.java
@@ -817,21 +817,21 @@ public static Block registerMiscBlock(String name, Function keyOfBlock(String id) {
- return RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, id));
+ return RegistryKey.of(RegistryKeys.BLOCK, MiddleEarth.id(id));
}
public static RegistryKey- keyOfItem(String id) {
- return RegistryKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, id));
+ return RegistryKey.of(RegistryKeys.ITEM, MiddleEarth.id(id));
}
public static void registerModBlocks() {
- MiddleEarth.LOGGER.logDebugMsg("Registering ModBlocks for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Blocks");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/DecorativeBlockRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/DecorativeBlockRegistryME.java
index 590ce05191..20fe94176b 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/DecorativeBlockRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/DecorativeBlockRegistryME.java
@@ -791,6 +791,6 @@ private static ToIntFunction createLightLevelFromLitBlockState(int l
}
public static void registerModBlocks() {
- MiddleEarth.LOGGER.logDebugMsg("Registering ModBlocks for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Decorative Blocks");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/GenericBlockSetRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/GenericBlockSetRegistryME.java
index eb8adf6d2c..5e1a14a1ea 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/GenericBlockSetRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/GenericBlockSetRegistryME.java
@@ -487,6 +487,6 @@ private static OxidizableBlockSetBuilder registerOxidizableBlockSet(OxidizableBl
}
public static void registerModBlockSets() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Generic Block Sets for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Generic Block Sets");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/NatureBlockRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/NatureBlockRegistryME.java
index cd78bcbdd3..9030336e48 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/NatureBlockRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/NatureBlockRegistryME.java
@@ -667,7 +667,7 @@ public static Block registerBlock(String name, Function PART = EnumProperty.of("part", ArtisanTablePart.class);
- private static final Text TITLE = Text.translatable("container.%s.artisan_table".formatted(MiddleEarth.MOD_ID));
+ private static final Text TITLE = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONTAINER, "artisan_table")
+ );
public ArtisanTable(Settings settings) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/bellows/BellowsBlockEntityRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/bellows/BellowsBlockEntityRenderer.java
index 81fa21bb51..5aeaa7c2c3 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/bellows/BellowsBlockEntityRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/bellows/BellowsBlockEntityRenderer.java
@@ -98,6 +98,7 @@ private float getAnimationProgress(BellowsBlockEntity bellowsBlockEntity){
private SpriteIdentifier getSpriteIdentifier(float animationProgress){
int spriteState = (int) Math.max(0, Math.min(2, animationProgress * 7.5f));
return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
- Identifier.of(MiddleEarth.MOD_ID, "model/bellows/bellows_" + spriteState));
+ MiddleEarth.idFilePath("model", "bellows", "bellows_" + spriteState)
+ );
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/crockpot/CrockpotBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/crockpot/CrockpotBlockEntity.java
index e553ac0a50..baf7a43050 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/crockpot/CrockpotBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/crockpot/CrockpotBlockEntity.java
@@ -32,6 +32,7 @@
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.random.Random;
import net.minecraft.world.World;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.special.forge.MultipleStackRecipeInput;
import net.sevenstars.middleearth.recipe.CrockpotRecipe;
@@ -320,7 +321,9 @@ public Object getScreenOpeningData(ServerPlayerEntity serverPlayerEntity) {
@Override
public Text getDisplayName() {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + "." + ID);
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, ID)
+ );
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/forge/ForgeBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/forge/ForgeBlockEntity.java
index f77a1a3ce7..d7f713a1de 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/forge/ForgeBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/forge/ForgeBlockEntity.java
@@ -11,6 +11,7 @@
import net.minecraft.server.world.ServerWorld;
import net.minecraft.storage.ReadView;
import net.minecraft.storage.WriteView;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.BlockEntityRegistryME;
import net.sevenstars.middleearth.block.registration.DecorativeBlockRegistryME;
@@ -133,7 +134,9 @@ public ItemStack getRenderStack(ForgeBlockEntity entity) {
@Override
public Text getDisplayName() {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + "." + ID);
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, ID)
+ );
}
public int getStorage() {
@@ -390,11 +393,11 @@ public static void outputItemStack(int amount, Vec3d coords, ServerPlayerEntity
else if(entity.currentMetal.isVanilla()) {
itemstack.set(DataComponentTypes.TRIM, new ArmorTrim(
armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(entity.currentMetal.getName()))),
- armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID, "smithing_part")))));
+ armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id("smithing_part")))));
} else {
itemstack.set(DataComponentTypes.TRIM, new ArmorTrim(
- armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(MiddleEarth.MOD_ID, entity.currentMetal.getName()))),
- armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID, "smithing_part")))));
+ armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, MiddleEarth.id(entity.currentMetal.getName()))),
+ armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id("smithing_part")))));
}itemstack.set(DataComponentTypesME.TEMPERATURE_DATA, new TemperatureDataComponent(100));
}
@@ -408,12 +411,12 @@ else if(entity.currentMetal.isVanilla()) {
} else if (entity.currentMetal.isVanilla()){
itemstack.set(DataComponentTypes.TRIM, new ArmorTrim(
armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(entity.currentMetal.getName()))),
- armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID, "smithing_part")))));
+ armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id("smithing_part")))));
} else {
itemstack.set(DataComponentTypes.TRIM, new ArmorTrim(
- armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(MiddleEarth.MOD_ID, entity.currentMetal.getName()))),
- armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID, "smithing_part")))));
+ armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, MiddleEarth.id(entity.currentMetal.getName()))),
+ armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id("smithing_part")))));
}
itemstack.set(DataComponentTypesME.TEMPERATURE_DATA, new TemperatureDataComponent(100));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/plate/PlateFoodModels.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/plate/PlateFoodModels.java
index a2d8f6b75e..335e180a84 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/plate/PlateFoodModels.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/plate/PlateFoodModels.java
@@ -16,7 +16,7 @@ public static Identifier getPlateIdentifier(Identifier itemIdentifier) {
}
public static void addVanillaModel(String name) {
- plateModels.put(Identifier.ofVanilla(name), Identifier.of(MiddleEarth.MOD_ID, "plate_" + name));
+ plateModels.put(Identifier.ofVanilla(name), MiddleEarth.id("plate_" + name));
}
public static void addModel(String name) {
plateModels.put(MiddleEarth.id(name), MiddleEarth.idAggregate('_', "plate", name));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestBlockEntity.java
index 77d870c67b..3f007d49de 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestBlockEntity.java
@@ -1,5 +1,6 @@
package net.sevenstars.middleearth.block.special.reinforcedChest;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.BlockEntityRegistryME;
import net.minecraft.block.Block;
@@ -115,6 +116,8 @@ public void markDirty() {
@Override
public Text getDisplayName() {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + ".reinforced_chest" );
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "reinforced_chest")
+ );
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestEntityRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestEntityRenderer.java
index a0c84c286f..04a0509333 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestEntityRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/reinforcedChest/ReinforcedChestEntityRenderer.java
@@ -50,7 +50,7 @@ public static TexturedModelData getTexturedModelData() {
@Override
public void render(T entity, float tickProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, Vec3d cameraPos) {
SpriteIdentifier spriteIdentifier = new SpriteIdentifier(TexturedRenderLayers.CHEST_ATLAS_TEXTURE,
- Identifier.of(MiddleEarth.MOD_ID, "model/reinforced_chest"));
+ MiddleEarth.idFilePath("model", "reinforced_chest"));
VertexConsumer vertexConsumer = spriteIdentifier.getVertexConsumer(vertexConsumers, RenderLayer::getEntityCutout);
World world = entity.getWorld();
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/shapingAnvil/ShapingAnvilBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/shapingAnvil/ShapingAnvilBlockEntity.java
index c585b2e877..dd1af3ef16 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/shapingAnvil/ShapingAnvilBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/shapingAnvil/ShapingAnvilBlockEntity.java
@@ -11,6 +11,7 @@
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.storage.ReadView;
import net.minecraft.storage.WriteView;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.BlockEntityRegistryME;
import net.sevenstars.middleearth.block.special.forge.MetalTypes;
@@ -208,19 +209,19 @@ public void bonk(ShapingAnvilBlockEntity entity, ServerWorld world, ItemStack to
output.set(DataComponentTypes.TRIM, input.get(DataComponentTypes.TRIM));
} else{
MetalTypes metal = MetalTypes.EMPTY;
- if(input.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "ingot_shaping")))) {
+ if(input.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("ingot_shaping")))) {
metal = MetalTypes.getMetalByIngot(input.getItem());
- }else if(input.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "nugget_shaping")))) {
+ }else if(input.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("nugget_shaping")))) {
metal = MetalTypes.getMetalByNugget(input.getItem());
}
if (metal.isVanilla()){
output.set(DataComponentTypes.TRIM, new ArmorTrim(
armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(metal.getName()))),
- armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID,"smithing_part")))));
+ armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id("smithing_part")))));
} else {
output.set(DataComponentTypes.TRIM, new ArmorTrim(
- armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(MiddleEarth.MOD_ID, metal.getName()))),
- armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID, "smithing_part")))));
+ armorTrimMaterialRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL, MiddleEarth.id(metal.getName()))),
+ armorTrimPatternRegistry.getOrThrow(RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id("smithing_part")))));
}
}
if (input.get(DataComponentTypesME.TEMPERATURE_DATA) != null){
@@ -295,7 +296,9 @@ protected void readData(ReadView view) {
@Override
public Text getDisplayName() {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + "." + ID);
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, ID)
+ );
}
@Nullable
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/skull/OldSkullBlockEntityRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/skull/OldSkullBlockEntityRenderer.java
index a3eeb51e62..c6f88d220f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/skull/OldSkullBlockEntityRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/skull/OldSkullBlockEntityRenderer.java
@@ -76,11 +76,11 @@ public static void renderSkull(@Nullable Direction direction, float yaw, float a
}
public static RenderLayer getRenderLayer() {
- return RenderLayer.getEntityCutoutNoCullZOffset(Identifier.of(MiddleEarth.MOD_ID, "model/old_skull"));
+ return RenderLayer.getEntityCutoutNoCullZOffset(MiddleEarth.idFilePath("model", "old_skull"));
}
private SpriteIdentifier getSpriteIdentifier(){
return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
- Identifier.of(MiddleEarth.MOD_ID, "model/old_skull"));
+ MiddleEarth.id("model/old_skull"));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/StructureManagerBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/StructureManagerBlockEntity.java
index 417e65f915..a986c2f24b 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/StructureManagerBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/StructureManagerBlockEntity.java
@@ -19,6 +19,7 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.BlockEntityRegistryME;
import net.sevenstars.middleearth.block.special.structureManager.features.SpawnNestManager;
@@ -90,7 +91,9 @@ public void updateData(Identifier structureManagerId, boolean isActive, boolean
@Override
public Text getDisplayName() {
- return Text.translatable("screen.%s.%s".formatted(MiddleEarth.MOD_ID, ID));
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, ID)
+ );
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/nest/StructureNestBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/nest/StructureNestBlockEntity.java
index cf1c02f735..5ddc5bd916 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/nest/StructureNestBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/structureManager/nest/StructureNestBlockEntity.java
@@ -16,6 +16,7 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.BlockEntityRegistryME;
import net.sevenstars.middleearth.block.special.structureManager.StructureManagerBlockEntity;
@@ -65,7 +66,9 @@ public Object getScreenOpeningData(ServerPlayerEntity serverPlayerEntity) {
}
public Text getDisplayName() {
- return Text.translatable("screen.%s.%s".formatted(MiddleEarth.MOD_ID, ID));
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, ID)
+ );
}
@Nullable
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/wood_pile/WoodPileBlockEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/wood_pile/WoodPileBlockEntity.java
index d42e81b96c..ce3527d592 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/wood_pile/WoodPileBlockEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/block/special/wood_pile/WoodPileBlockEntity.java
@@ -2,6 +2,7 @@
import net.minecraft.storage.ReadView;
import net.minecraft.storage.WriteView;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.BlockEntityRegistryME;
import net.sevenstars.middleearth.block.registration.DecorativeBlockRegistryME;
@@ -38,7 +39,9 @@ public WoodPileBlockEntity(BlockPos pos, BlockState state) {
@Override
public Text getDisplayName() {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + "." + ID);
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, ID)
+ );
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/client/ModelLoaderME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/client/ModelLoaderME.java
index ceb41577d7..bc4da43e38 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/client/ModelLoaderME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/client/ModelLoaderME.java
@@ -31,14 +31,14 @@ public ModelLoaderME(LoadedEntityModels entityModels, Map 0) {
String newTex = texture.replaceAll("_helmet.png", "_addition_" + variant + ".png");
CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, this.helmetAddonModel,
- Identifier.of(MiddleEarth.MOD_ID, newTex), dyeable);
+ MiddleEarth.id(newTex), dyeable);
} else {
CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, this.helmetAddonModel,
- Identifier.of(MiddleEarth.MOD_ID, texture.replaceAll("_helmet.png", "_addition.png")), dyeable);
+ MiddleEarth.id(texture.replaceAll("_helmet.png", "_addition.png")), dyeable);
}
} else {
- CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, this.helmetAddonModel, Identifier.of(MiddleEarth.MOD_ID, texture.replaceAll(".png", "_addition.png")), dyeable);
+ CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, this.helmetAddonModel, MiddleEarth.id(texture.replaceAll(".png", "_addition.png")), dyeable);
}
}
@@ -76,10 +76,10 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
Identifier textureHelmetAttachment;
HelmetAddonModel helmetAttachmentModel;
if (hoodDataComponent.down()){
- textureHelmetAttachment = Identifier.of(MiddleEarth.MOD_ID, "textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + "_down.png");
+ textureHelmetAttachment = MiddleEarth.id("textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + "_down.png");
helmetAttachmentModel = ArmorModelsME.CustomHelmetAttachmentPairedModels.valueOf(hoodDataComponent.helmetAttachment().getName().toUpperCase()).getModel().getArmoredDownModel();
} else {
- textureHelmetAttachment = Identifier.of(MiddleEarth.MOD_ID, "textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + ".png");
+ textureHelmetAttachment = MiddleEarth.id("textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + ".png");
helmetAttachmentModel = ArmorModelsME.CustomHelmetAttachmentPairedModels.valueOf(hoodDataComponent.helmetAttachment().getName().toUpperCase()).getModel().getArmoredModel();
}
contextModel.copyTransforms(helmetAttachmentModel);
@@ -89,7 +89,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
if (DyeablePiecesME.dyeableHelmetAttachments.containsKey(hoodDataComponent.getHelmetAttachment())) {
HelmetAttachmentRenderer.renderDyeableHelmetAttachment(matrices, vertexConsumers, light, stack, helmetAttachmentModel, textureHelmetAttachment, true);
if (DyeablePiecesME.dyeableHelmetAttachments.get(hoodDataComponent.helmetAttachment())){
- CustomArmorRenderer.renderTranslucentPiece(matrices, vertexConsumers, light, stack, helmetAttachmentModel, Identifier.of(MiddleEarth.MOD_ID, textureHelmetAttachment.getPath().replaceAll(".png", "_overlay.png")));
+ CustomArmorRenderer.renderTranslucentPiece(matrices, vertexConsumers, light, stack, helmetAttachmentModel, MiddleEarth.id(textureHelmetAttachment.getPath().replaceAll(".png", "_overlay.png")));
}
} else {
CustomArmorRenderer.renderTranslucentPiece(matrices, vertexConsumers, light, stack, helmetAttachmentModel, textureHelmetAttachment);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/LeggingsArmorRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/LeggingsArmorRenderer.java
index 7c550d7ea4..5c31bc9d04 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/LeggingsArmorRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/LeggingsArmorRenderer.java
@@ -37,7 +37,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
}
String texture = "textures/models/armor/" + Registries.ITEM.getId(stack.getItem()).getPath() + ".png";
- CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, customLeggingsModel, Identifier.of(MiddleEarth.MOD_ID, texture), dyeable);
+ CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, customLeggingsModel, MiddleEarth.id(texture), dyeable);
}
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/WoodlandCrownRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/WoodlandCrownRenderer.java
index 88e5628732..685c04745a 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/WoodlandCrownRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/client/renderer/armor/WoodlandCrownRenderer.java
@@ -64,12 +64,12 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
texture += ".png";
- CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, customHelmetModel, Identifier.of(MiddleEarth.MOD_ID, texture), dyeable);
+ CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, customHelmetModel, MiddleEarth.id(texture), dyeable);
if (this.helmetAddonModel != null) {
contextModel.copyTransforms(this.helmetAddonModel);
this.helmetAddonModel.setVisible(false);
this.helmetAddonModel.head.visible = true;
- CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, this.helmetAddonModel, Identifier.of(MiddleEarth.MOD_ID, texture.replaceAll(".png", "_addition.png")), dyeable);
+ CustomArmorRenderer.renderArmor(matrices, vertexConsumers, light, stack, this.helmetAddonModel, MiddleEarth.id(texture.replaceAll(".png", "_addition.png")), dyeable);
}
HelmetAttachmentDataComponent hoodDataComponent = stack.get(DataComponentTypesME.HELMET_ATTACHMENT_DATA);
@@ -78,10 +78,10 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
Identifier textureHelmetAttachment;
HelmetAddonModel helmetAttachmentModel;
if (hoodDataComponent.down()){
- textureHelmetAttachment = Identifier.of(MiddleEarth.MOD_ID, "textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + "_down.png");
+ textureHelmetAttachment = MiddleEarth.id("textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + "_down.png");
helmetAttachmentModel = ArmorModelsME.CustomHelmetAttachmentPairedModels.valueOf(hoodDataComponent.helmetAttachment().getName().toUpperCase()).getModel().getArmoredDownModel();
} else {
- textureHelmetAttachment = Identifier.of(MiddleEarth.MOD_ID, "textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + ".png");
+ textureHelmetAttachment = MiddleEarth.id("textures/models/helmet_attachment/" + hoodDataComponent.helmetAttachment().getName().toLowerCase() + ".png");
helmetAttachmentModel = ArmorModelsME.CustomHelmetAttachmentPairedModels.valueOf(hoodDataComponent.helmetAttachment().getName().toUpperCase()).getModel().getArmoredModel();
}
contextModel.copyTransforms(helmetAttachmentModel);
@@ -91,7 +91,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
if (DyeablePiecesME.dyeableHelmetAttachments.containsKey(hoodDataComponent.getHelmetAttachment())) {
HelmetAttachmentRenderer.renderDyeableHelmetAttachment(matrices, vertexConsumers, light, stack, helmetAttachmentModel, textureHelmetAttachment, true);
if (DyeablePiecesME.dyeableHelmetAttachments.get(hoodDataComponent.helmetAttachment())){
- CustomArmorRenderer.renderTranslucentPiece(matrices, vertexConsumers, light, stack, helmetAttachmentModel, Identifier.of(MiddleEarth.MOD_ID, textureHelmetAttachment.getPath().replaceAll(".png", "_overlay.png")));
+ CustomArmorRenderer.renderTranslucentPiece(matrices, vertexConsumers, light, stack, helmetAttachmentModel, MiddleEarth.id(textureHelmetAttachment.getPath().replaceAll(".png", "_overlay.png")));
}
} else {
CustomArmorRenderer.renderTranslucentPiece(matrices, vertexConsumers, light, stack, helmetAttachmentModel, textureHelmetAttachment);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/CommandRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/CommandRegistryME.java
index dc7fcc7c9f..4c7673e165 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/CommandRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/CommandRegistryME.java
@@ -18,5 +18,6 @@ public static void register() {
CommandRegistrationCallback.EVENT.register(CommandCustomEquipment::register);
CommandRegistrationCallback.EVENT.register(CommandInformation::register);
CommandRegistrationCallback.EVENT.register(CommandDimensionTeleport::register);
+ CommandRegistrationCallback.EVENT.register(CommandConfig::register);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandConfig.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandConfig.java
new file mode 100644
index 0000000000..484350d219
--- /dev/null
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandConfig.java
@@ -0,0 +1,66 @@
+package net.sevenstars.middleearth.commands.custom;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.context.CommandContext;
+import net.minecraft.command.CommandRegistryAccess;
+import net.minecraft.server.command.CommandManager;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.Text;
+import net.sevenstars.middleearth.commands.CommandRegistryME;
+import net.sevenstars.middleearth.config.ClientConfigME;
+import net.sevenstars.middleearth.config.ServerConfigME;
+
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class CommandConfig {
+ private static final String CONFIG_BASE_COMMAND = "config";
+ private static final String RELOAD = "reload";
+ private static final String RESET = "reset";
+
+ public static void register(CommandDispatcher dispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) {
+ // [CONFIG]
+ dispatcher.register(
+ literal(CommandRegistryME.BASE_COMMAND)
+ .then(literal(CONFIG_BASE_COMMAND)
+ .then(literal(RELOAD)
+ .executes(CommandConfig::reloadConfig)
+ )
+ )
+ );
+
+ dispatcher.register(
+ literal(CommandRegistryME.BASE_COMMAND)
+ .then(literal(CONFIG_BASE_COMMAND)
+ .then(literal(RESET)
+ .executes(CommandConfig::resetConfig)
+ )
+ )
+ );
+ }
+
+ private static int reloadConfig(CommandContext context) {
+ ServerCommandSource source = context.getSource();
+ ClientConfigME.reload();
+
+ if (source.hasPermissionLevel(2)) {
+ ServerConfigME.reload();
+ source.sendMessage(Text.literal("Reloaded Middle-earth CLIENT and SERVER configs."));
+ } else {
+ source.sendMessage(Text.literal("Reloaded Middle-earth CLIENT config (server config requires OP)."));
+ }
+ return 1;
+ }
+
+ private static int resetConfig(CommandContext context) {
+ ServerCommandSource source = context.getSource();
+ ClientConfigME.reset();
+
+ if (source.hasPermissionLevel(2)) {
+ ServerConfigME.reset();
+ source.sendMessage(Text.literal("Reset Middle-earth CLIENT and SERVER configs."));
+ } else {
+ source.sendMessage(Text.literal("Reset Middle-earth CLIENT config (server config requires OP)."));
+ }
+ return 1;
+ }
+}
\ No newline at end of file
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandCustomEquipment.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandCustomEquipment.java
index ab0a5da8ac..d260a7f253 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandCustomEquipment.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandCustomEquipment.java
@@ -4,6 +4,7 @@
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;
import net.minecraft.component.type.DyedColorComponent;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.commands.CommandRegistryME;
import net.sevenstars.middleearth.commands.suggestions.AllBackAttachmentsSuggestionProvider;
@@ -63,18 +64,26 @@ private static int setBackAttachment(CommandContext context
ItemStack handStack = Objects.requireNonNull(context.getSource().getPlayer()).getInventory().getSelectedStack();
if (handStack.isEmpty()){
- MutableText sourceText = Text.translatable("command.%s.back_attachment.hand_empty".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "back_attachment.hand_empty")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
if ((handStack.getItem() instanceof CustomChestplateItem || handStack.getItem() instanceof BackAttachmentItem)){
handStack.set(DataComponentTypesME.BACK_ATTACHMENT_DATA, BackAttachmentDataComponent.newBackAttachment(backAttachment));
- MutableText sourceText = Text.translatable("command.%s.back_attachment.success".formatted(MiddleEarth.MOD_ID)).append(Text.translatable("tooltip." + MiddleEarth.MOD_ID + "." + backAttachment.getName()));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "back_attachment.success")
+ ).append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, backAttachment.getName())
+ ));
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
} else {
- MutableText sourceText = Text.translatable("command.%s.back_attachment.wrong_item".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "back_attachment.wrong_item")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -86,7 +95,9 @@ private static int setHelmetAttachment(CommandContext conte
ItemStack handStack = Objects.requireNonNull(context.getSource().getPlayer()).getInventory().getSelectedStack();
if (handStack.isEmpty()){
- MutableText sourceText = Text.translatable("command.%s.helmet_attachment.hand_empty".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "helmet_attachment.hand_empty")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -97,11 +108,17 @@ private static int setHelmetAttachment(CommandContext conte
} else if (helmetAttachment.getConstantState() == HelmetAttachmentsStatesME.UP || helmetAttachment.getConstantState() == null){
handStack.set(DataComponentTypesME.HELMET_ATTACHMENT_DATA, new HelmetAttachmentDataComponent(false, helmetAttachment, DyedColorComponent.DEFAULT_COLOR));
}
- MutableText sourceText = Text.translatable("command.%s.helmet_attachment.success".formatted(MiddleEarth.MOD_ID)).append(Text.translatable("tooltip." + MiddleEarth.MOD_ID + "." + helmetAttachment.getName()));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "helmet_attachment.success")
+ ).append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, helmetAttachment.getName())
+ ));
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
} else {
- MutableText sourceText = Text.translatable("command.%s.helmet_attachment.wrong_item".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "helmet_attachment.wrong_item")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandFaction.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandFaction.java
index 5b7cf8a91a..6062b733bd 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandFaction.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandFaction.java
@@ -12,6 +12,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.commands.CommandUtils;
import net.sevenstars.middleearth.commands.CommandRegistryME;
@@ -108,14 +109,20 @@ private static int getBanner(CommandContext context) {
try{
Faction faction = FactionLookup.getFactionById(source.getWorld(), factionIdentifier);
source.giveItemStack(faction.getBannerItem(source.getWorld().getRegistryManager()));
- MutableText sourceText = Text.translatable("command.%s.faction.banner.success".formatted(MiddleEarth.MOD_ID), faction.getFullName().formatted(Formatting.GOLD));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "faction.banner.success"),
+ faction.getFullName().formatted(Formatting.GOLD));
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
} catch (FactionIdentifierException e){
- MutableText sourceText = Text.translatable("command.%s.faction.banner.fail_id".formatted(MiddleEarth.MOD_ID), Text.of(factionIdentifier.toString()));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "faction.banner.fail_id"),
+ Text.of(factionIdentifier.toString()));
source.sendMessage(sourceText.withColor(ColorsME.ALERT.color));
return 0;
} catch (Exception e){
- MutableText sourceText = Text.translatable("command.%s.faction.banner.fail_error".formatted(MiddleEarth.MOD_ID), Text.of(factionIdentifier.toString()));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "faction.banner.fail_error"),
+ Text.of(factionIdentifier.toString()));
source.sendMessage(sourceText.withColor(ColorsME.ALERT.color));
return 0;
}
@@ -129,11 +136,15 @@ private static int getFaction(CommandContext context) {
if(source != null){
Faction currentFaction = PlayerDataService.getPlayerFaction(source, source.getWorld());
if(currentFaction == null){
- MutableText sourceText = Text.translatable("command.%s.get.faction.no_faction".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.faction.no_faction")
+ );
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
- MutableText sourceText = Text.translatable("command.%s.get.faction.success".formatted(MiddleEarth.MOD_ID), currentFaction.getFullName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.faction.success"),
+ currentFaction.getFullName());
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
}
@@ -147,11 +158,15 @@ private static int getTargetFaction(CommandContext context)
if(source != null){
Faction currentFaction = PlayerDataService.getPlayerFaction(source, source.getWorld());
if(currentFaction == null){
- MutableText sourceText = Text.translatable("command.%s.get.player.faction.no_faction".formatted(MiddleEarth.MOD_ID), targetedPlayer.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.player.faction.no_faction"),
+ targetedPlayer.getName());
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
- MutableText sourceText = Text.translatable("command.%s.get.player.faction.success".formatted(MiddleEarth.MOD_ID), targetedPlayer.getName(), currentFaction.getFullName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.player.faction.success"),
+ targetedPlayer.getName(), currentFaction.getFullName());
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
}
@@ -164,7 +179,9 @@ private static int clearFaction(CommandContext context) {
if(source != null) {
try {
if (FactionUtil.clearFaction(source)) {
- MutableText sourceText = Text.translatable("command.%s.clear.faction.success".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "clear.faction.success")
+ );
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
return 1;
@@ -191,7 +208,9 @@ private static int clearTargetFaction(CommandContext contex
if(context.getSource() != null) {
try {
if (FactionUtil.clearFaction(playerSource)) {
- MutableText sourceText = Text.translatable("command.%s.clear.player.faction.success".formatted(MiddleEarth.MOD_ID), targetedPlayer.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "clear.player.faction.success"),
+ targetedPlayer.getName());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
return 1;
@@ -240,7 +259,9 @@ private static int forceTargetToJoinFaction(CommandContext
Faction faction = FactionLookup.getFactionById(context.getSource().getWorld(), factionIdentifier);
if(context.getSource().isExecutedByPlayer()){
ServerPlayerEntity source = context.getSource().getPlayer();
- MutableText sourceText = Text.translatable("command.%s.join.faction.join.success".formatted(MiddleEarth.MOD_ID), targetedPlayer.getName(), faction.getFullName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "join.faction.join.success"),
+ targetedPlayer.getName(), faction.getFullName());
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
} catch (FactionIdentifierException e) {
@@ -278,7 +299,9 @@ public static boolean updateFactionFromCommand(ServerPlayerEntity target, Server
if(spawnId != null){
errorMessage = Text.translatable(SpawnIdentifierException.KEY, spawnId.toString());
} else {
- errorMessage = Text.translatable("command.%s.fail".formatted(MiddleEarth.MOD_ID));
+ errorMessage = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "fail")
+ );
}
source.sendMessage(errorMessage.withColor(ColorsME.ALERT.color));
return false;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandOnboarding.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandOnboarding.java
index 0ffe565ff1..51d355c174 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandOnboarding.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandOnboarding.java
@@ -11,6 +11,7 @@
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.commands.CommandUtils;
import net.sevenstars.middleearth.commands.CommandRegistryME;
@@ -74,7 +75,9 @@ private static int tryOpen(CommandContext context) {
if(playerPassedOnboarding){
ServerPlayNetworking.send(playerSource, new PacketForceOnboardingScreen(ServerConfigME.DELAY_ON_TELEPORT_CONFIRMATION, playerSource));
} else {
- MutableText sourceText = Text.translatable("command.%s.open.onboarding.error".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "open.onboarding.error")
+ );
playerSource.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
}
@@ -88,10 +91,14 @@ private static int tryOpenForTarget(CommandContext context)
boolean playerPassedOnboarding = PlayerDataService.playerPassedOnboarding(playerTarget);
if(playerPassedOnboarding){
ServerPlayNetworking.send(playerTarget, new PacketForceOnboardingScreen(ServerConfigME.DELAY_ON_TELEPORT_CONFIRMATION, playerTarget));
- MutableText sourceText = Text.translatable("command.%s.open_target.onboarding.success".formatted(MiddleEarth.MOD_ID), playerTarget.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "open_target.onboarding.success"),
+ playerTarget.getName());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
} else {
- MutableText sourceText = Text.translatable("command.%s.open_target.onboarding.error".formatted(MiddleEarth.MOD_ID), playerTarget.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "open_target.onboarding.error"),
+ playerTarget.getName());
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandRace.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandRace.java
index 8769c9c4af..577013d96e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandRace.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandRace.java
@@ -3,6 +3,7 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.commands.CommandUtils;
import net.sevenstars.middleearth.commands.CommandRegistryME;
@@ -72,12 +73,16 @@ private static int getRace(CommandContext context) {
if(playerSource != null){
Race playerRace = PlayerDataService.getPlayerRace(playerSource, playerSource.getWorld());
if(playerRace != null){
- MutableText sourceText = Text.translatable("command.%s.race.get.success".formatted(MiddleEarth.MOD_ID),
- playerRace.getFullName().copyContentOnly().withColor(RACE_COLOR));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.get.success"),
+ playerRace.getFullName().copyContentOnly().withColor(RACE_COLOR)
+ );
playerSource.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
- MutableText sourceText = Text.translatable("command.%s.race.get.fail".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.get.fail")
+ );
playerSource.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
}
@@ -95,14 +100,18 @@ private static int getTargetRace(CommandContext context) th
if(id != null){
Race race = RaceLookup.getRace(context.getSource().getWorld(), id);
if(race != null){
- MutableText sourceText = Text.translatable("command.%s.race.get.target.success".formatted(MiddleEarth.MOD_ID), targetPlayer.getName(),
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.get.target.success"),
+ targetPlayer.getName(),
race.getFullName().copyContentOnly().withColor(RACE_COLOR));
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
}
}
- MutableText sourceText = Text.translatable("command.%s.race.get.target.fail".formatted(MiddleEarth.MOD_ID), targetPlayer.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.get.target.fail"),
+ targetPlayer.getName());
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
}
@@ -120,13 +129,16 @@ private static int setRace(CommandContext context) {
Race race = RaceLookup.getRace(source.getWorld(), raceId);
if(race != null){
RaceUtil.updateRace(source, race, true);
- MutableText sourceText = Text.translatable("command.%s.race.set.success".formatted(MiddleEarth.MOD_ID),
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.set.success"),
race.getFullName().copyContentOnly().withColor(RACE_COLOR));
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
}
- MutableText sourceText = Text.translatable("command.%s.race.set.fail".formatted(MiddleEarth.MOD_ID), raceId.toString());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.set.fail"),
+ raceId.toString());
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
}
@@ -144,12 +156,15 @@ private static int setTargetRace(CommandContext context) th
Race race = RaceLookup.getRace(targetPlayer.getWorld(), raceId);
if(race != null){
RaceUtil.updateRace(targetPlayer, race, true);
- MutableText targetText = Text.translatable("command.%s.race.set.success".formatted(MiddleEarth.MOD_ID),
+ MutableText targetText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.set.success"),
race.getFullName().copyContentOnly().withColor(RACE_COLOR));
targetPlayer.sendMessage(targetText.withColor(ColorsME.SUCCESS.color));
if(source != null){
- MutableText sourceText = Text.translatable("command.%s.race.set.target.success".formatted(MiddleEarth.MOD_ID), targetPlayer.getName(),
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.set.target.success"),
+ targetPlayer.getName(),
race.getFullName().copyContentOnly().withColor(RACE_COLOR));
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
@@ -157,7 +172,9 @@ private static int setTargetRace(CommandContext context) th
return 0;
}
}
- MutableText sourceText = Text.translatable("command.%s.race.set.target.fail".formatted(MiddleEarth.MOD_ID), raceId.toString());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.set.target.fail"),
+ raceId.toString());
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
return 0;
@@ -173,11 +190,15 @@ private static int resetRace(CommandContext context) {
if(playerData != null){
RaceUtil.updateRace(source, null, true);
RaceUtil.reset(source);
- MutableText sourceText = Text.translatable("command.%s.race.reset.success".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.reset.success")
+ );
source.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
- MutableText sourceText = Text.translatable("command.%s.race.reset.fail".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.reset.fail")
+ );
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
}
@@ -194,14 +215,20 @@ private static int resetTargetRace(CommandContext context)
RaceUtil.reset(targetPlayer);
if(source != null && targetPlayer != null) {
- MutableText sourceText = Text.translatable("command.%s.race.reset.target.success".formatted(MiddleEarth.MOD_ID), targetPlayer.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.reset.target.success"),
+ targetPlayer.getName());
targetPlayer.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
- MutableText targetText = Text.translatable("command.%s.race.reset.success".formatted(MiddleEarth.MOD_ID));
+ MutableText targetText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.reset.success")
+ );
targetPlayer.sendMessage(targetText.withColor(ColorsME.SUCCESS.color));
return 0;
}
- MutableText sourceText = Text.translatable("command.%s.race.reset.target.fail".formatted(MiddleEarth.MOD_ID), targetPlayer.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "race.reset.target.fail"),
+ targetPlayer.getName());
source.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandSpawn.java b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandSpawn.java
index 58dd63001f..605118da36 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandSpawn.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/commands/custom/CommandSpawn.java
@@ -19,6 +19,7 @@
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraft.world.dimension.DimensionTypes;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.commands.CommandRegistryME;
import net.sevenstars.middleearth.commands.suggestions.AllAvailableSpawnSuggestionProvider;
@@ -176,7 +177,9 @@ private static int getSpawnOverworld(CommandContext context
ServerPlayerEntity playerSource = context.getSource().getPlayer();
PlayerDataService.OriginAggregate originAggregate = PlayerDataService.getOriginAggregateOrDefault(playerSource, playerSource.getWorld());
BlockPos pos = originAggregate.origin();
- MutableText sourceText = Text.translatable("command.%s.get.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), pos.getX(), pos.getY(), pos.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.spawn.overworld.success"),
+ pos.getX(), pos.getY(), pos.getZ());
context.getSource().getPlayer().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
@@ -187,7 +190,9 @@ private static int getPlayerSpawnOverworld(CommandContext c
PlayerData data = StateSaverAndLoader.getPlayerState(playerTarget);
PlayerDataService.OriginAggregate originAggregate = PlayerDataService.getOriginAggregateOrDefault(playerTarget, playerTarget.getWorld());
BlockPos pos = originAggregate.origin();
- MutableText sourceText = Text.translatable("command.%s.get.player.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), playerTarget.getName(), pos.getX(), pos.getY(), pos.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.player.spawn.overworld.success"),
+ playerTarget.getName(), pos.getX(), pos.getY(), pos.getZ());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
@@ -200,10 +205,14 @@ private static int getSpawnMiddleEarth(CommandContext conte
SpawnData spawnData = PlayerDataService.getPlayerSpawnData(playerSource, playerSource.getWorld());
if(spawnData != null){
BlockPos pos = spawnData.getBlockPos();
- MutableText sourceText = Text.translatable("command.%s.get.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID), Text.translatable("spawn."+ spawnData.getIdentifier().toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.spawn.middle_earth.success"),
+ Text.translatable("spawn."+ spawnData.getIdentifier().toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
context.getSource().getPlayer().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
} else {
- MutableText sourceText = Text.translatable("command.%s.get.spawn.middle_earth.no_spawn".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.spawn.middle_earth.no_spawn")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
return 0;
@@ -217,10 +226,14 @@ private static int getPlayerSpawnMiddleEarth(CommandContext
SpawnData spawnData = PlayerDataService.getPlayerSpawnData(playerTarget, playerTarget.getWorld());
if(spawnData != null){
BlockPos pos = spawnData.getBlockPos();
- MutableText sourceText = Text.translatable("command.%s.get.player.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID), playerTarget.getName(), Text.translatable("spawn."+spawnData.getIdentifier().toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.player.spawn.middle_earth.success"),
+ playerTarget.getName(), Text.translatable("spawn."+spawnData.getIdentifier().toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
} else {
- MutableText sourceText = Text.translatable("command.%s.get.player.spawn.middle_earth.no_spawn".formatted(MiddleEarth.MOD_ID), playerTarget.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "get.player.spawn.middle_earth.no_spawn"),
+ playerTarget.getName());
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
}
return 0;
@@ -236,7 +249,9 @@ private static int setSpawnMiddleEarth(CommandContext conte
Identifier spawnIdInput = IdentifierArgumentType.getIdentifier(context, SPAWN_ID);
if(!PlayerDataService.playerPassedOnboarding(playerSource)){
- MutableText sourceText = Text.translatable("command.%s.set.spawn.middle_earth.no_faction".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.middle_earth.no_faction")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -249,12 +264,16 @@ private static int setSpawnMiddleEarth(CommandContext conte
ServerPlayerEntity.Respawn respawn = new ServerPlayerEntity.Respawn(DimensionRegistryME.ME_WORLD_KEY, pos, 0, true);
playerSource.setSpawnPoint(respawn, true);
}
- MutableText sourceText = Text.translatable("command.%s.set.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID), Text.translatable("spawn."+spawnIdInput.toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.middle_earth.success"),
+ Text.translatable("spawn."+spawnIdInput.toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
playerSource.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
}
- MutableText sourceText = Text.translatable("command.%s.set.spawn.middle_earth.no_spawn_found".formatted(MiddleEarth.MOD_ID), spawnIdInput.toString());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.middle_earth.no_spawn_found"),
+ spawnIdInput.toString());
playerSource.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -265,7 +284,9 @@ private static int setPlayerSpawnMiddleEarth(CommandContext
Identifier spawnIdInput = IdentifierArgumentType.getIdentifier(context, SPAWN_ID);
if(!PlayerDataService.playerPassedOnboarding(playerTarget)){
- MutableText sourceText = Text.translatable("command.%s.set.player.spawn.middle_earth.no_faction".formatted(MiddleEarth.MOD_ID), playerTarget.getName());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.player.spawn.middle_earth.no_faction"),
+ playerTarget.getName());
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -279,14 +300,20 @@ private static int setPlayerSpawnMiddleEarth(CommandContext
playerTarget.setSpawnPoint(respawn, true);
}
- MutableText targetText = Text.translatable("command.%s.set.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID), Text.translatable("spawn."+spawnIdInput.toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
+ MutableText targetText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.middle_earth.success"),
+ Text.translatable("spawn."+spawnIdInput.toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
playerTarget.sendMessage(targetText.withColor(ColorsME.SUCCESS.color));
- MutableText sourceText = Text.translatable("command.%s.set.player.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID), playerTarget.getName(),Text.translatable("spawn."+spawnIdInput.toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.player.spawn.middle_earth.success"),
+ playerTarget.getName(),Text.translatable("spawn."+spawnIdInput.toTranslationKey()), pos.getX(), pos.getY(), pos.getZ());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
}
- MutableText sourceText = Text.translatable("command.%s.set.spawn.middle_earth.no_spawn_found".formatted(MiddleEarth.MOD_ID), spawnIdInput.toString());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.middle_earth.no_spawn_found"),
+ spawnIdInput.toString());
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
@@ -307,7 +334,9 @@ private static int setSpawnOverworld(CommandContext context
return 0;
}
}
- MutableText sourceText = Text.translatable("command.%s.set.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), posInput.getX(), posInput.getY(), posInput.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.overworld.success"),
+ posInput.getX(), posInput.getY(), posInput.getZ());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
@@ -318,10 +347,14 @@ private static int setPlayerSpawnOverworld(CommandContext c
PlayerDataService.setOrigin(playerTarget, playerTarget.getWorld(), DimensionTypes.OVERWORLD.getRegistry(), posInput);
- MutableText sourceText = Text.translatable("command.%s.set.player.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), playerTarget.getName() ,posInput.getX(), posInput.getY(), posInput.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.player.spawn.overworld.success"),
+ playerTarget.getName() ,posInput.getX(), posInput.getY(), posInput.getZ());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
- MutableText targetText = Text.translatable("command.%s.set.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), posInput.getX(), posInput.getY(), posInput.getZ());
+ MutableText targetText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "set.spawn.overworld.success"),
+ posInput.getX(), posInput.getY(), posInput.getZ());
playerTarget.sendMessage(targetText.withColor(ColorsME.SUCCESS.color));
return 0;
@@ -335,9 +368,13 @@ private static int resetPlayerSpawnOverworld(CommandContext
BlockPos posInput = context.getSource().getServer().getOverworld().getSpawnPos();
PlayerDataService.setOrigin(playerTarget, playerTarget.getWorld(), DimensionTypes.OVERWORLD.getRegistry(), posInput);
- MutableText sourceText = Text.translatable("command.%s.reset.player.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), playerTarget.getName(), posInput.getX(), posInput.getY(), posInput.getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "reset.player.spawn.overworld.success"),
+ playerTarget.getName(), posInput.getX(), posInput.getY(), posInput.getZ());
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
- MutableText targetText = Text.translatable("command.%s.reset.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), posInput.getX(), posInput.getY(), posInput.getZ());
+ MutableText targetText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "reset.spawn.overworld.success"),
+ posInput.getX(), posInput.getY(), posInput.getZ());
playerTarget.sendMessage(targetText.withColor(ColorsME.SUCCESS.color));
return 0;
}
@@ -348,7 +385,9 @@ private static int resetSpawnOverworld(CommandContext conte
ServerPlayerEntity playerSource = context.getSource().getPlayer();
PlayerDataService.resetOrigin(playerSource, playerSource.getWorld());
PlayerDataService.OriginAggregate newOrigin = PlayerDataService.getOriginAggregateOrDefault(playerSource, playerSource.getWorld());
- MutableText sourceText = Text.translatable("command.%s.reset.spawn.overworld.success".formatted(MiddleEarth.MOD_ID), newOrigin.origin().getX(), newOrigin.origin().getY(), newOrigin.origin().getZ());
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "reset.spawn.overworld.success"),
+ newOrigin.origin().getX(), newOrigin.origin().getY(), newOrigin.origin().getZ());
playerSource.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
@@ -357,18 +396,23 @@ private static int resetPlayerSpawnMiddleEarth(CommandContext con
return 0;
ServerPlayerEntity playerSource = context.getSource().getPlayer();
if(!PlayerDataService.playerPassedOnboarding(playerSource)){
- MutableText sourceText = Text.translatable("command.%s.reset.spawn.middle_earth.no_faction".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "reset.spawn.middle_earth.no_faction")
+ );
playerSource.sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -391,7 +437,8 @@ private static int resetSpawnMiddleEarth(CommandContext con
if(PlayerDataService.resetSpawn(playerSource, playerSource.getWorld())){
SpawnData data = PlayerDataService.getPlayerSpawnData(playerSource, playerSource.getWorld());
- MutableText sourceText = Text.translatable("command.%s.reset.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID),
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "reset.spawn.middle_earth.success"),
Text.translatable("spawn." + data.getIdentifier().toTranslationKey()), data.getBlockPos().getX(), data.getBlockPos().getY(), data.getBlockPos().getZ());
playerSource.sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
}
@@ -425,14 +472,17 @@ private static int teleportToSpawnMiddleEarth(CommandContext
ServerPlayerEntity player = context.getSource().getPlayer();
if(DimensionRegistryME.teleportPlayerToOverworld(player)){
- MutableText sourceText = Text.translatable("command.%s.teleport.spawn.middle_earth.success".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "teleport.spawn.middle_earth.success")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.SUCCESS.color));
return 0;
}
- MutableText sourceText = Text.translatable("command.%s.teleport.spawn.middle_earth.error".formatted(MiddleEarth.MOD_ID));
+ MutableText sourceText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.COMMAND, "teleport.spawn.middle_earth.error")
+ );
context.getSource().sendMessage(sourceText.withColor(ColorsME.WARNING.color));
return 0;
}
@@ -491,11 +551,15 @@ private static int teleportPlayerToSpawnOverworld(CommandContext ARTISAN_TABLE_CATEGORY = CategoryIdentifier.of(MiddleEarth.MOD_ID, "artisan_table");
- public static final CategoryIdentifier FORGE_CATEGORY = CategoryIdentifier.of(MiddleEarth.MOD_ID, "forge");
+ public static final CategoryIdentifier ARTISAN_TABLE_CATEGORY = CategoryIdentifier.of("artisan_table");
+ public static final CategoryIdentifier FORGE_CATEGORY = CategoryIdentifier.of("forge");
@Override
public void registerDisplaySerializer(DisplaySerializerRegistry registry) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/compat/artisantable/ArtisanTableCategory.java b/middle-earth/src/main/java/net/sevenstars/middleearth/compat/artisantable/ArtisanTableCategory.java
index 1209d49593..3c9ccb1b58 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/compat/artisantable/ArtisanTableCategory.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/compat/artisantable/ArtisanTableCategory.java
@@ -12,6 +12,7 @@
import net.fabricmc.api.Environment;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.DecorativeBlockRegistryME;
import net.sevenstars.middleearth.compat.REICommonPluginME;
@@ -31,7 +32,9 @@ public CategoryIdentifier getCategoryIdentifier()
@Override
public Text getTitle() {
- return Text.translatable("container." + MiddleEarth.MOD_ID + ".artisan_table");
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONTAINER, "artisan_table")
+ );
}
@Override
@@ -69,7 +72,9 @@ public List setupDisplay(ArtisanTableDisplay display, Rectangle bounds)
.markOutput().entries(display.getOutputEntries().get((0))));
widgets.add(Widgets.createLabel(new Point(startPoint.x + 63, startPoint.y + 5),
- Text.translatable("screen." + MiddleEarth.MOD_ID +".artisan_table." + display.getCategory())));
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "artisan_table." + display.getCategory())
+ )));
return widgets;
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/compat/forge/AlloyingCategory.java b/middle-earth/src/main/java/net/sevenstars/middleearth/compat/forge/AlloyingCategory.java
index f24963ff73..0c4cf042be 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/compat/forge/AlloyingCategory.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/compat/forge/AlloyingCategory.java
@@ -13,6 +13,7 @@
import net.fabricmc.api.Environment;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.DecorativeBlockRegistryME;
import net.sevenstars.middleearth.compat.REICommonPluginME;
@@ -32,7 +33,9 @@ public CategoryIdentifier getCategoryIdentifier() {
@Override
public Text getTitle() {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + ".forge");
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "forge")
+ );
}
@Override
@@ -63,7 +66,9 @@ public List setupDisplay(AlloyingDisplay display, Rectangle bounds) {
widgets.add(Widgets.createTexturedWidget(TEXTURE,startPoint.x + 106, startPoint.y + 75 - storedLiquid, 211, 76 - storedLiquid, 20, storedLiquid));
widgets.add(Widgets.createLabel(new Point(startPoint.x + 77, startPoint.y + 5),
- Text.translatable("trim_material." + MiddleEarth.MOD_ID + "." + display.output)));
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TRIM_MATERIAL, display.output)
+ )));
return widgets;
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/config/ClientConfigME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/config/ClientConfigME.java
index 052a8d7619..3e77adac5c 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/config/ClientConfigME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/config/ClientConfigME.java
@@ -1,13 +1,15 @@
package net.sevenstars.middleearth.config;
import com.mojang.datafixers.util.Pair;
+import net.minecraft.client.resource.language.I18n;
import net.sevenstars.api.config.ConfigProvider;
import net.sevenstars.api.config.SimpleConfig;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
public class ClientConfigME {
public static SimpleConfig CONFIG;
- private final static String PATH = MiddleEarth.MOD_ID + "/config-client";
+ private final static String PATH = MiddleEarth.getModId() + "/config-client"; // FIXME: might be a better way
/**Should you see the map overlay button in the middle-earth map gui**/
public static boolean ENABLE_MAP_OVERLAY;
@@ -30,25 +32,25 @@ public static void registerConfigs() {
}
private static void createClientConfigs() {
- configs.addSection("Client Configs");
- configs.addComment("This file stores client configuration options for the Middle-earth mod.");
+ configs.addSection(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.section.title")));
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.comment.title.line_1")));
configs.addLineJump();
- configs.addComment("GUI configurations");
- configs.addDescription("Should you see the map overlay button in the middle-earth map gui?");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.comment.gui")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.description.gui.line_1")));
configs.addKeyValuePair(new Pair<>("enableMapOverlay", false), "boolean");
configs.addLineJump();
- configs.addComment("NPC simplified model");
- configs.addDescription("Should you see the experimental npc visuals, or use the simplified version.");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.comment.npc")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.description.npc.line_1")));
configs.addKeyValuePair(new Pair<>("enableSimplifiedCharacterRendering", false), "boolean");
configs.addLineJump();
- configs.addComment("LOD distance for NPCs");
- configs.addDescription("Distance of rendering armor on NPCs");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.comment.lod")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.description.lod.line_1")));
configs.addKeyValuePair(new Pair<>("npcsArmorDistanceLOD", 48), "int");
- configs.addDescription("Distance of rendering NPCs features (long hair, ears, etc.)");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.description.lod.line_2")));
configs.addKeyValuePair(new Pair<>("npcsFeaturesDistanceLOD", 24), "int");
configs.addLineJump();
- configs.addComment("Glint config");
- configs.addDescription("Should glint be disabled in middle-earth");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.comment.glint")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "client.description.glint.line_1")));
configs.addKeyValuePair(new Pair<>("disableGlint", true), "boolean");
}
@@ -56,8 +58,27 @@ private static void assignClientConfigs() {
ENABLE_MAP_OVERLAY = CONFIG.getOrDefault("enableMapOverlay", false);
ENABLE_SIMPLIFIED_CHARACTER_RENDERING = CONFIG.getOrDefault("enableSimplifiedCharacterRendering", false);
LOD_NPC_ARMOR_DISTANCE = CONFIG.getOrDefault("npcsArmorDistanceLOD", 48);
- LOD_NPC_FEATURES_DISTANCE = CONFIG.getOrDefault("npcsArmorDistanceLOD", 24);
+ LOD_NPC_FEATURES_DISTANCE = CONFIG.getOrDefault("npcsFeaturesDistanceLOD", 24);
DISABLE_GLINT = CONFIG.getOrDefault("disableGlint", true);
MiddleEarth.LOGGER.logDebugMsg("All client configs (" + configs.getConfigsList().size() + ") have been set properly");
}
-}
\ No newline at end of file
+
+ /**
+ * To make the edit work without restart the game
+ * by the command ingame
+ * /middle_earth config reload
+ */
+ public static void reload() {
+ if (CONFIG != null) {
+ CONFIG.reload();
+ assignClientConfigs();
+ }
+ }
+
+ public static void reset() {
+ if (CONFIG != null) {
+ CONFIG.delete();
+ }
+ registerConfigs();
+ }
+}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/config/ServerConfigME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/config/ServerConfigME.java
index 95e9e3b051..4bbcf0fe49 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/config/ServerConfigME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/config/ServerConfigME.java
@@ -1,13 +1,15 @@
package net.sevenstars.middleearth.config;
import com.mojang.datafixers.util.Pair;
+import net.minecraft.client.resource.language.I18n;
import net.sevenstars.api.config.ConfigProvider;
import net.sevenstars.api.config.SimpleConfig;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
public class ServerConfigME {
public static SimpleConfig CONFIG;
- private final static String PATH = MiddleEarth.MOD_ID + "/config-common";
+ private final static String PATH = MiddleEarth.getModId() + "/config-common"; // FIXME: might be a better way
private static ConfigProvider configs;
/**Should players be allowed to change factions when they use the starlight phial?**/
@@ -43,52 +45,52 @@ public static void registerConfigs() {
}
private static void createServerConfigs() {
- configs.addSection("Server Configs");
- configs.addComment("This file stores server/host configuration options for the Middle-earth mod.");
+ configs.addSection(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.section.title")));
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.title.line_1")));
configs.addLineJump();
// World configurations
- configs.addComment("World configurations");
- configs.addDescription("Should players respawn at their selected spawn location in Middle-earth if they die without having a bed assigned?");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.world")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.world.line_1")));
configs.addKeyValuePair(new Pair<>("enableSpawnOverride", true), "boolean");
- configs.addDescription("Should players be able to return to the overworld by reusing the starlight phial?");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.world.line_2")));
configs.addKeyValuePair(new Pair<>("enableReturnToOverworld", true), "boolean");
- configs.addDescription("Should procedural structures (such as Orthanc) generate in Middle-earth?");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.world.line_3")));
configs.addKeyValuePair(new Pair<>("enableProceduralStructures", true), "boolean");
- configs.addDescription("Maximum amount of non-persistent entity per type in Middle-earth");
- configs.addKeyValuePair(new Pair<>("globalMobCap", true), "int");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.world.line_4")));
+ configs.addKeyValuePair(new Pair<>("globalMobCap", 50), "int");
configs.addLineJump();
// PlayerFactionPayload configurations
- configs.addComment("PlayerFactionPayload configurations");
- configs.addDescription("Should players be allowed to change factions when they use the starlight phial?");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.player")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.player.line_1")));
configs.addKeyValuePair(new Pair<>("enableFactionReset", true), "boolean");
- configs.addDescription("Should players keep their race when returning to the Overworld");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.player.line_2")));
configs.addKeyValuePair(new Pair<>("enableKeepRaceOnDimensionSwap", true), "boolean");
- configs.addDescription("Amount of time before teleporting");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.player.line_3")));
configs.addKeyValuePair(new Pair<>("delayOnTeleportConfirmation", 3), "int");
configs.addLineJump();
// Mount configurations
- configs.addComment("Mount configurations");
- configs.addDescription("Should players and NPCs be allowed to ride broadhoof goats?");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.mount")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.mount.line_1")));
configs.addKeyValuePair(new Pair<>("enableMountBroadhoofGoat", true), "boolean");
// Food configurations
- configs.addComment("Food configurations");
- configs.addDescription("Should players be allowed to craft golden apples and golden carrots in Middle-earth?");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.food")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.food.line_1")));
configs.addKeyValuePair(new Pair<>("enableGoldenFoodRecipes", false), "boolean");
// Golem configurations
- configs.addComment("Golem configurations");
- configs.addDescription("Should players be allowed to place golems with block patterns in Middle-earth?");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.golem")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.golem.line_1")));
configs.addKeyValuePair(new Pair<>("enableGolems", false), "boolean");
// Enchants configurations
- configs.addComment("Enchants configurations");
- configs.addDescription("What is the maximum level a sharpness can have in an anvil output");
+ configs.addComment(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.comment.enchant")));
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.enchant.line_1")));
configs.addKeyValuePair(new Pair<>("sharpnessMaxLevel", 3), "int");
- configs.addDescription("What is the maximum level a power can have in an anvil output");
+ configs.addDescription(I18n.translate(MiddleEarth.rawTranslationKeyWithModId(LangCategory.CONFIG, "server.description.enchant.line_2")));
configs.addKeyValuePair(new Pair<>("powerMaxLevel", 3), "int");
}
@@ -107,11 +109,30 @@ private static void assignServerConfigs() {
ENABLE_MOUNT_BROADHOOF_GOAT = CONFIG.getOrDefault("enableMountBroadhoofGoat", true);
ENABLE_GOLDEN_FOOD_RECIPES = CONFIG.getOrDefault("enableGoldenFoodRecipes", false);
- ENABLE_GOLEMS = CONFIG.getOrDefault("enableGoldenFoodRecipes", false);
+ ENABLE_GOLEMS = CONFIG.getOrDefault("enableGolems", false);
SHARPNESS_MAX_LEVEL = CONFIG.getOrDefault("sharpnessMaxLevel", 3);
POWER_MAX_LEVEL = CONFIG.getOrDefault("powerMaxLevel", 3);
MiddleEarth.LOGGER.logDebugMsg("All server configs (" + configs.getConfigsList().size() + ") have been set properly");
}
+
+ /**
+ * To make the edit work without restart the game
+ * by the command ingame
+ * /middle_earth config reload
+ */
+ public static void reload() {
+ if (CONFIG != null) {
+ CONFIG.reload();
+ assignServerConfigs();
+ }
+ }
+
+ public static void reset() {
+ if (CONFIG != null) {
+ CONFIG.delete();
+ }
+ registerConfigs();
+ }
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/ModelsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/ModelsME.java
index 46ae45421d..c5fc722b9d 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/ModelsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/ModelsME.java
@@ -54,11 +54,11 @@ public class ModelsME {
public static final Model PATH_BLOCK;
private static Model block(String parent, TextureKey... requiredTextureKeys) {
- return new Model(Optional.of(Identifier.of(MiddleEarth.MOD_ID, "block/" + parent)), Optional.empty(), requiredTextureKeys);
+ return new Model(Optional.of(MiddleEarth.id("block/" + parent)), Optional.empty(), requiredTextureKeys);
}
private static Model block(String parent, String variant, TextureKey... requiredTextureKeys) {
- return new Model(Optional.of(Identifier.of(MiddleEarth.MOD_ID, "block/" + parent)), Optional.of(variant), requiredTextureKeys);
+ return new Model(Optional.of(MiddleEarth.id("block/" + parent)), Optional.of(variant), requiredTextureKeys);
}
static {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/TranslationEntries.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/TranslationEntries.java
index db29470e80..defd80b259 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/TranslationEntries.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/TranslationEntries.java
@@ -822,42 +822,42 @@ public class TranslationEntries {
put(of(LangCategory.UI, "search.screen_click_button"), "Screen Click Button");
- put(of(LangCategory.KEY, "category", MiddleEarth.MOD_ID), "Middle-earth");
+ put(of(LangCategory.KEY, "category", ""), "Middle-earth");
put(of(LangCategory.KEY, "hood_state_toggle"), "Toggle Worn Hood state");
put(of(LangCategory.KEY, "map_teleport"), "Map Teleport");
put(of(LangCategory.KEY, "map_fullscreen_toggle"), "Toggle Map Fullscreen");
- put("modmenu.nameTranslation." + MiddleEarth.MOD_ID, "Middle-earth");
- put("modmenu.descriptionTranslation." + MiddleEarth.MOD_ID, "Join the legendary world of Tolkien's universe from The Lord of The Rings to the Hobbit and more!");
- put("modmenu.summaryTranslation." + MiddleEarth.MOD_ID, "Join the legendary world of Tolkien's universe from The Lord of The Rings to the Hobbit and more!");
+ put(of(LangCategory.MOD_MENU, "nameTranslation", ""), "Middle-earth");
+ put(of(LangCategory.MOD_MENU, "descriptionTranslation", ""), "Join the legendary world of Tolkien's universe from The Lord of The Rings to the Hobbit and more!");
+ put(of(LangCategory.MOD_MENU, "summaryTranslation", ""), "Join the legendary world of Tolkien's universe from The Lord of The Rings to the Hobbit and more!");
put(of(LangCategory.EMI, "forge"), "Forge");
put(of(LangCategory.EMI, "anvil_shaping"), "Shaping Anvil");
put(of(LangCategory.EMI, "artisan_table"), "Artisan Table");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "anvil_items"), "Anvil Items");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "bones"), "Bones");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "cloaks"), "Cloaks");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "cooked_poultry"), "Cooked Poultry");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "dyeable"), "Dyeable");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "feathers"), "Feathers");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "glowy"), "Glowing Items");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "ingot_shaping"), "Ingot Shaping");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "lead_ores"), "Lead Ores");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "mithril_ores"), "Mithril Ores");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "mod_planks"), "Middle-earth Planks");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "mod_stripped_logs"), "Middle-earth Stripped Logs");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "mushroom_stew_ingredient"), "Mushroom Stew Ingredient");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "nugget_shaping"), "Nugget Shaping");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "raw_poultry"), "Raw Poultry");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "shard"), "Shard");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "shingles"), "Shingles");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "silver_ores"), "Silver Ores");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "thatchy"), "Thatch");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "tin"), "Tin");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "tin_ores"), "Tin Ores");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "warg_food"), "Warg Food");
- put(of(LangCategory.TAG, "item." + MiddleEarth.MOD_ID, "worm"), "Worm");
+ put(of(LangCategory.TAG, "item", "anvil_items"), "Anvil Items");
+ put(of(LangCategory.TAG, "item", "bones"), "Bones");
+ put(of(LangCategory.TAG, "item", "cloaks"), "Cloaks");
+ put(of(LangCategory.TAG, "item", "cooked_poultry"), "Cooked Poultry");
+ put(of(LangCategory.TAG, "item", "dyeable"), "Dyeable");
+ put(of(LangCategory.TAG, "item", "feathers"), "Feathers");
+ put(of(LangCategory.TAG, "item", "glowy"), "Glowing Items");
+ put(of(LangCategory.TAG, "item", "ingot_shaping"), "Ingot Shaping");
+ put(of(LangCategory.TAG, "item", "lead_ores"), "Lead Ores");
+ put(of(LangCategory.TAG, "item", "mithril_ores"), "Mithril Ores");
+ put(of(LangCategory.TAG, "item", "mod_planks"), "Middle-earth Planks");
+ put(of(LangCategory.TAG, "item", "mod_stripped_logs"), "Middle-earth Stripped Logs");
+ put(of(LangCategory.TAG, "item", "mushroom_stew_ingredient"), "Mushroom Stew Ingredient");
+ put(of(LangCategory.TAG, "item", "nugget_shaping"), "Nugget Shaping");
+ put(of(LangCategory.TAG, "item", "raw_poultry"), "Raw Poultry");
+ put(of(LangCategory.TAG, "item", "shard"), "Shard");
+ put(of(LangCategory.TAG, "item", "shingles"), "Shingles");
+ put(of(LangCategory.TAG, "item", "silver_ores"), "Silver Ores");
+ put(of(LangCategory.TAG, "item", "thatchy"), "Thatch");
+ put(of(LangCategory.TAG, "item", "tin"), "Tin");
+ put(of(LangCategory.TAG, "item", "tin_ores"), "Tin Ores");
+ put(of(LangCategory.TAG, "item", "warg_food"), "Warg Food");
+ put(of(LangCategory.TAG, "item", "worm"), "Worm");
put(of(LangCategory.PAINTING, "author.boenndal"), "Boenndal");
put(of(LangCategory.PAINTING, "author.scosher"), "Scosher");
@@ -891,15 +891,86 @@ public class TranslationEntries {
put("attribute.modifiers." + RacePools.RaceAttributes.TOTAL_DAMAGE_MODIFIER.getPath(), "Add Total Damage Multiplied");
put("attribute.modifiers.creative_mode_block_range", "Creative Mode Block Range");
put("attribute.modifiers.creative_mode_entity_range", "Creative Mode Entity Range");
+
+ // TODO: make config translatable keys auto-generate
+ // pairs
+
+ // client config
+ put(of(LangCategory.CONFIG, "client.section.title"), "Client Configs");
+ put(of(LangCategory.CONFIG, "client.comment.title.line_1"), "This file stores client configuration options for the Middle-earth mod.");
+ put(of(LangCategory.CONFIG, "client.comment.gui"), "GUI configurations");
+ put(of(LangCategory.CONFIG, "client.description.gui.line_1"), "Should you see the map overlay button in the middle-earth map gui?");
+ put(of(LangCategory.CONFIG, "client.comment.npc"), "NPC simplified model");
+ put(of(LangCategory.CONFIG, "client.description.npc.line_1"), "Should you see the experimental npc visuals, or use the simplified version.");
+ put(of(LangCategory.CONFIG, "client.comment.lod"), "LOD distance for NPCs");
+ put(of(LangCategory.CONFIG, "client.description.lod.line_1"), "Distance of rendering armor on NPCs");
+ put(of(LangCategory.CONFIG, "client.description.lod.line_2"), "Distance of rendering NPCs features (long hair, ears, etc.)");
+ put(of(LangCategory.CONFIG, "client.comment.glint"), "Glint config");
+ put(of(LangCategory.CONFIG, "client.description.glint.line_1"), "Should glint be disabled in middle-earth");
+
+ // server config / common config
+ put(of(LangCategory.CONFIG, "server.section.title"), "Server Configs");
+ put(of(LangCategory.CONFIG, "server.comment.title.line_1"), "This file stores server/host configuration options for the Middle-earth mod.");
+ put(of(LangCategory.CONFIG, "server.comment.world"), "World configurations");
+ put(of(LangCategory.CONFIG, "server.description.world.line_1"), "Should players respawn at their selected spawn location in Middle-earth if they die without having a bed assigned?");
+ put(of(LangCategory.CONFIG, "server.description.world.line_2"), "Should players be able to return to the overworld by reusing the starlight phial?");
+ put(of(LangCategory.CONFIG, "server.description.world.line_3"), "Should procedural structures (such as Orthanc) generate in Middle-earth?");
+ put(of(LangCategory.CONFIG, "server.description.world.line_4"), "Maximum amount of non-persistent entity per type in Middle-earth");
+ put(of(LangCategory.CONFIG, "server.comment.player"), "PlayerFactionData configurations");
+ put(of(LangCategory.CONFIG, "server.description.player.line_1"), "Should players be allowed to change factions when they use the starlight phial?");
+ put(of(LangCategory.CONFIG, "server.description.player.line_2"), "Should players keep their race when returning to the Overworld");
+ put(of(LangCategory.CONFIG, "server.description.player.line_3"), "Amount of time before teleporting");
+ put(of(LangCategory.CONFIG, "server.comment.mount"), "Mount configurations");
+ put(of(LangCategory.CONFIG, "server.description.mount.line_1"), "Should players and NPCs be allowed to ride broadhoof goats?");
+ put(of(LangCategory.CONFIG, "server.comment.food"), "Food configurations");
+ put(of(LangCategory.CONFIG, "server.description.food.line_1"), "Should players be allowed to craft golden apples and golden carrots in Middle-earth?");
+ put(of(LangCategory.CONFIG, "server.comment.golem"), "Golem configurations");
+ put(of(LangCategory.CONFIG, "server.description.golem.line_1"), "Should players be allowed to place golems with block patterns in Middle-earth?");
+ put(of(LangCategory.CONFIG, "server.comment.enchant"), "Enchants configurations");
+ put(of(LangCategory.CONFIG, "server.description.enchant.line_1"), "What is the maximum level a sharpness can have in an anvil output");
+ put(of(LangCategory.CONFIG, "server.description.enchant.line_2"), "What is the maximum level a power can have in an anvil output");
+
}
};
- public static String of(LangCategory langCategory, String otherPrefix, String value) {
- return MiddleEarth.rawTranslationKey(langCategory.Prefix + "." + otherPrefix, value);
- }
+ /**
+ *
Most common use
+ *
+ *
keys like:
+ *
CATEGORY.MOD_ID.VALUE
+ *
->
+ *
of(CATEGORY, VALUE)
+ */
public static String of(LangCategory langCategory, String value) {
- return of(langCategory, MiddleEarth.MOD_ID, value);
+ return of(langCategory, "", value);
+ }
+
+ /**
+ *
1. keys like:
+ *
CATEGORY.OTHER.MOD_ID.VALUE
+ *
(tag.item.middle-earth.anvil_items)
+ *
->
+ *
of(CATEGORY, OTHER, VALUE)
+ *
+ *
2. if no value:
+ *
CATEGORY.OTHER.MOD_ID
+ *
(modmenu.nameTranslation.middle-earth)
+ *
->
+ *
of(CATEGORY, OTHER, "")
+ */
+ public static String of(LangCategory langCategory, String otherPrefix, String value) {
+ String prefix = langCategory.Prefix;
+ if (!"".equals(otherPrefix)) {
+ prefix += "." + otherPrefix;
+ }
+ return MiddleEarth.rawTranslationKeyWithModId(prefix, value);
+
}
+
+ /**
+ *
keys like:
+ *
CATEGORY.VALUE
+ */
public static String ofRaw(LangCategory langCategory, String value) {
return MiddleEarth.rawTranslationKey(langCategory, value);
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/models/HotMetalsModel.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/models/HotMetalsModel.java
index 3774c56c3f..8fe6456bb2 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/models/HotMetalsModel.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/content/models/HotMetalsModel.java
@@ -94,13 +94,13 @@ public record ShapingItem(Item item, Item output, int amount) {}
public static List shapesTag = new ArrayList<>() {
{
- //add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "nugget_shaping")), ModResourceItems.MAIL_RING, 25));
- //add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "nugget_shaping")), ModResourceItems.SCALE, 25));
+ //add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("nugget_shaping")), ModResourceItems.MAIL_RING, 25));
+ //add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("nugget_shaping")), ModResourceItems.SCALE, 25));
- add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "ingot_shaping")), ResourceItemsME.SHORT_BLADE, 80));
- add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "ingot_shaping")), ResourceItemsME.SHOVEL_HEAD, 80));
- add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "ingot_shaping")), ResourceItemsME.SWORD_HILT, 80));
- add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "ingot_shaping")), ResourceItemsME.SHIELD_BORDER, 80));
+ add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("ingot_shaping")), ResourceItemsME.SHORT_BLADE, 80));
+ add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("ingot_shaping")), ResourceItemsME.SHOVEL_HEAD, 80));
+ add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("ingot_shaping")), ResourceItemsME.SWORD_HILT, 80));
+ add(new ShapingTag(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("ingot_shaping")), ResourceItemsME.SHIELD_BORDER, 80));
}
};
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/DataWorldGenerator.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/DataWorldGenerator.java
index 0a1811caed..36705b0c3f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/DataWorldGenerator.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/DataWorldGenerator.java
@@ -22,6 +22,6 @@ protected void configure(RegistryWrapper.WrapperLookup registries, Entries entri
@Override
public String getName() {
- return MiddleEarth.MOD_ID;
+ return MiddleEarth.getModId(); // FIXME: might be a better way
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/EnchantmentProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/EnchantmentProvider.java
index 0616ab229c..7947837092 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/EnchantmentProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/EnchantmentProvider.java
@@ -27,6 +27,6 @@ private void register(Entries entries, RegistryKey key, Enchantment
@Override
public String getName() {
- return MiddleEarth.MOD_ID + " Enchantments";
+ return MiddleEarth.getModId() + " Enchantments"; // FIXME: might be a better way
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/LanguageProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/LanguageProvider.java
index 8e426886aa..f675352a8e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/LanguageProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/LanguageProvider.java
@@ -5,6 +5,7 @@
import net.minecraft.block.Block;
import net.minecraft.registry.Registries;
import net.minecraft.registry.RegistryWrapper;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.special.forge.MetalTypes;
import net.sevenstars.middleearth.datageneration.content.TranslationEntries;
@@ -60,7 +61,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup wrapperLookup, Tr
if(!path.contains("_spawn_egg"))
path += "_spawn_egg";
- translationBuilder.add("item." + MiddleEarth.MOD_ID + "." + path, generateName(path));
+ translationBuilder.add(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM, path),
+ generateName(path)
+ );
});
TranslationEntries.itemEntries.forEach(item -> {
@@ -72,7 +76,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup wrapperLookup, Tr
});
TranslationEntries.biomeEntries.forEach(name -> {
- translationBuilder.add("biome." + MiddleEarth.MOD_ID + "." + name, generateName(name));
+ translationBuilder.add(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.BIOME, name),
+ generateName(name)
+ );
});
TranslationEntries.bannerPatternEntries.forEach(name -> {
@@ -142,7 +149,10 @@ public void createTranslation(TranslationBuilder translationBuilder, String pref
String [] sub = suffix.split("\\.");
suffixSplit = Arrays.stream(sub).toList().getLast();
}
- translationBuilder.add(prefix + "." + MiddleEarth.MOD_ID + "." + suffix, generateName(suffixSplit));
+ translationBuilder.add(
+ MiddleEarth.rawTranslationKeyWithModId(prefix, suffix),
+ generateName(suffixSplit)
+ );
}
public void createNpcDataTranslation(TranslationBuilder translationBuilder, String prefix, String suffix) {
@@ -164,11 +174,14 @@ public void createNpcDataTranslation(TranslationBuilder translationBuilder, Stri
}
}
- translationBuilder.add(prefix + "." + MiddleEarth.MOD_ID + "." + suffix, generatedName.toString());
+ translationBuilder.add(
+ MiddleEarth.rawTranslationKeyWithModId(prefix, suffix),
+ generatedName.toString()
+ );
}
public void createBannerTranslation(TranslationBuilder translationBuilder, String prefix, String suffix){
- String baseTranslationKey = prefix + "." + MiddleEarth.MOD_ID + "." + suffix;
+ String baseTranslationKey = MiddleEarth.rawTranslationKeyWithModId(prefix, suffix);
translationBuilder.add(baseTranslationKey + ".black", "Black " + generateName(suffix));
translationBuilder.add(baseTranslationKey + ".blue", "Blue " + generateName(suffix));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/BlockModelProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/BlockModelProvider.java
index f25e01546b..7216144221 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/BlockModelProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/BlockModelProvider.java
@@ -89,7 +89,7 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
for (Block wood : SimpleBlockModel.woodBlocks) {
TextureMap textureMap = new TextureMap().put(TextureKey.ALL,
- Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(wood).getPath().replaceAll("_wood", "_log").replaceAll("_hyphae", "_stem").replaceAll("treated_log", "treated_wood").replaceAll("aged_log", "aged_wood")));
+ MiddleEarth.id("block/" + Registries.BLOCK.getId(wood).getPath().replaceAll("_wood", "_log").replaceAll("_hyphae", "_stem").replaceAll("treated_log", "treated_wood").replaceAll("aged_log", "aged_wood")));
WeightedVariant identifier = createWeightedVariant(Models.CUBE_COLUMN.upload(wood, textureMap, blockStateModelGenerator.modelCollector));
blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createAxisRotatedBlockState(wood, identifier));
}
@@ -1039,7 +1039,7 @@ private void registerVerticalSlab(BlockStateModelGenerator blockStateModelGenera
} else if (fullBlock.getNamespace().contains("minecraft")) {
fullBlockVariant = createWeightedVariant(Identifier.ofVanilla(fullBlock.getPath()));
}else {
- fullBlockVariant = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, fullBlock.getPath()));
+ fullBlockVariant = createWeightedVariant(MiddleEarth.id(fullBlock.getPath()));
}
VariantsBlockModelDefinitionCreator blockstate = VariantsBlockModelDefinitionCreator.of(block).with(
@@ -1091,7 +1091,7 @@ private void registerVerticalSlab(BlockStateModelGenerator blockStateModelGenera
}
public void registerWoodStoolModelBlockStates(BlockStateModelGenerator blockStateModelGenerator, Block block){
- Identifier texture = Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(block).getPath().replaceAll("stool", "chair"));
+ Identifier texture = MiddleEarth.id("block/" + Registries.BLOCK.getId(block).getPath().replaceAll("stool", "chair"));
WeightedVariant weightedVariant = BlockStateModelGenerator.createWeightedVariant(ModelsME.WOOD_STOOL.upload(block,
new TextureMap().put(TextureKey.ALL, texture).put(TextureKey.PARTICLE, texture), blockStateModelGenerator.modelCollector));
@@ -1107,7 +1107,7 @@ public void registerWoodStoolModelBlockStates(BlockStateModelGenerator blockStat
}
public void registerWoodBenchModelBlockStates(BlockStateModelGenerator blockStateModelGenerator, Block block){
- Identifier texture = Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(block).getPath());
+ Identifier texture = MiddleEarth.id("block/" + Registries.BLOCK.getId(block).getPath());
WeightedVariant weightedVariant = BlockStateModelGenerator.createWeightedVariant(ModelsME.WOOD_BENCH.upload(block,
new TextureMap().put(TextureKey.ALL, texture).put(TextureKey.PARTICLE, texture), blockStateModelGenerator.modelCollector));
@@ -1123,7 +1123,7 @@ public void registerWoodBenchModelBlockStates(BlockStateModelGenerator blockStat
}
public void registerWoodTableModelBlockStates(BlockStateModelGenerator blockStateModelGenerator, Block block){
- Identifier texture = Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(block).getPath());
+ Identifier texture = MiddleEarth.id("block/" + Registries.BLOCK.getId(block).getPath());
WeightedVariant weightedVariant = BlockStateModelGenerator.createWeightedVariant(ModelsME.WOOD_TABLE.upload(block,
new TextureMap().put(TextureKey.ALL, texture).put(TextureKey.PARTICLE, texture), blockStateModelGenerator.modelCollector));
@@ -1132,7 +1132,7 @@ public void registerWoodTableModelBlockStates(BlockStateModelGenerator blockStat
}
public void registerWoodChairModelBlockStates(BlockStateModelGenerator blockStateModelGenerator, Block block){
- Identifier texture = Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(block).getPath());
+ Identifier texture = MiddleEarth.id("block/" + Registries.BLOCK.getId(block).getPath());
WeightedVariant weightedVariant = BlockStateModelGenerator.createWeightedVariant(ModelsME.WOOD_CHAIR.upload(block,
new TextureMap().put(TextureKey.ALL, texture).put(TextureKey.PARTICLE, texture), blockStateModelGenerator.modelCollector));
@@ -1238,10 +1238,10 @@ public final void registerLargeDoor(BlockStateModelGenerator blockStateModelGene
default -> rot;
};
- WeightedVariant weightedVariantLeft = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_" + i));
- WeightedVariant weightedVariantLeftOpen = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_open_" + i));
- WeightedVariant weightedVarianRight = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_" + i));
- WeightedVariant weightedVarianRightOpen = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_open_" + i));
+ WeightedVariant weightedVariantLeft = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_" + i));
+ WeightedVariant weightedVariantLeftOpen = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_open_" + i));
+ WeightedVariant weightedVarianRight = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_" + i));
+ WeightedVariant weightedVarianRightOpen = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_open_" + i));
statesMap.register(Direction.byIndex(k), false, DoorHinge.LEFT, i,
weightedVariantLeft.apply(ModelVariantOperator.ROTATION_Y.withValue(AxisRotation.valueOf("R" + rot))));
@@ -1257,23 +1257,23 @@ public final void registerLargeDoor(BlockStateModelGenerator blockStateModelGene
if (k == 2) {
ModelsME.LARGE_DOOR_LEFT.upload(largeDoor, "_left_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
ModelsME.LARGE_DOOR_LEFT_OPEN.upload(largeDoor, "_left_open_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
ModelsME.LARGE_DOOR_RIGHT.upload(largeDoor, "_right_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
ModelsME.LARGE_DOOR_RIGHT_OPEN.upload(largeDoor, "_right_open_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
}
}
@@ -1296,10 +1296,10 @@ public final void registerThickLargeDoor(BlockStateModelGenerator blockStateMode
default -> rot;
};
- WeightedVariant weightedVariantLeft = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_" + i));
- WeightedVariant weightedVariantLeftOpen = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_open_" + i));
- WeightedVariant weightedVarianRight = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_" + i));
- WeightedVariant weightedVarianRightOpen = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_open_" + i));
+ WeightedVariant weightedVariantLeft = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_" + i));
+ WeightedVariant weightedVariantLeftOpen = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_left_open_" + i));
+ WeightedVariant weightedVarianRight = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_" + i));
+ WeightedVariant weightedVarianRightOpen = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_right_open_" + i));
statesMap.register(Direction.byIndex(k), false, DoorHinge.LEFT, i,
weightedVariantLeft.apply(ModelVariantOperator.ROTATION_Y.withValue(AxisRotation.valueOf("R" + rot))));
@@ -1315,23 +1315,23 @@ public final void registerThickLargeDoor(BlockStateModelGenerator blockStateMode
if (k == 2) {
ModelsME.LARGE_THICK_DOOR_LEFT.upload(largeDoor, "_left_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
ModelsME.LARGE_THICK_DOOR_LEFT_OPEN.upload(largeDoor, "_left_open_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
ModelsME.LARGE_THICK_DOOR_RIGHT.upload(largeDoor, "_right_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
ModelsME.LARGE_THICK_DOOR_RIGHT_OPEN.upload(largeDoor, "_right_open_" + i,
- (new TextureMap()).put(TextureKey.ALL, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
- .put(TextureKey.PARTICLE, Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
+ (new TextureMap()).put(TextureKey.ALL, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i))
+ .put(TextureKey.PARTICLE, MiddleEarth.id("block/" + Registries.BLOCK.getId(largeDoor).getPath() + "_" + i)),
blockStateModelGenerator.modelCollector);
}
}
@@ -1398,7 +1398,7 @@ private void registerLayers(BlockStateModelGenerator blockStateModelGenerator, B
WeightedVariant var2;
if (integer < 8) {
int var10001 = integer;
- var2 = createWeightedVariant(Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(origin).getPath() + "_layer_height" + var10001 * 2));
+ var2 = createWeightedVariant(MiddleEarth.id("block/" + Registries.BLOCK.getId(origin).getPath() + "_layer_height" + var10001 * 2));
} else {
var2 = weightedVariant;
}
@@ -1494,7 +1494,7 @@ public void registerTrapdoor(BlockStateModelGenerator blockStateModelGenerator,
}
public void registerOrientableThickLadder(BlockStateModelGenerator blockStateModelGenerator, Block ladderBlock) {
- Identifier texture = Identifier.of(MiddleEarth.MOD_ID, "block/" + Registries.BLOCK.getId(ladderBlock).getPath());
+ Identifier texture = MiddleEarth.id("block/" + Registries.BLOCK.getId(ladderBlock).getPath());
WeightedVariant weightedVariant = createWeightedVariant(ModelsME.THICK_LADDER.upload(ladderBlock, TextureMap.of(TextureKey.ALL, texture), blockStateModelGenerator.modelCollector));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/ItemModelProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/ItemModelProvider.java
index eb8dfa2cb5..fd8b3c671b 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/ItemModelProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/models/ItemModelProvider.java
@@ -249,7 +249,7 @@ public final void registerGenericBigModels(ItemModelGenerator itemModelGenerator
public final void registerPipeItemModels(ItemModelGenerator itemModelGenerator, Item item) {
String path = Registries.ITEM.getId(item).getPath();
ItemModel.Unbaked unbakedHand = ItemModels.basic(ModelIds.getItemModelId(item));
- ItemModel.Unbaked unbakedSmokingHand = ItemModels.basic(Identifier.of(MiddleEarth.MOD_ID, "item/smoking_" + path));
+ ItemModel.Unbaked unbakedSmokingHand = ItemModels.basic(MiddleEarth.id("item/smoking_" + path));
ItemModel.Unbaked unbakedInventory = ItemModels.basic(itemModelGenerator.registerSubModel(item, "_inventory", Models.GENERATED));
itemModelGenerator.output.accept(item, ItemModels.select(new DisplayContextProperty(),
@@ -364,7 +364,7 @@ public final void registerDyeableArmor(Item armor, ItemModelGenerator itemModelG
}
public final void registerPalettedItem(Item item, ItemModelGenerator itemModelGenerator) {
- Identifier identifierItem = Identifier.of(MiddleEarth.MOD_ID, "item/" + Registries.ITEM.getId(item).getPath());
+ Identifier identifierItem = MiddleEarth.id("item/" + Registries.ITEM.getId(item).getPath());
Identifier identifier2 = TextureMap.getId(item);
@@ -377,7 +377,7 @@ public final void registerPalettedItem(Item item, ItemModelGenerator itemModelGe
Identifier identifier4 = identifierItem.withSuffixedPath("_" + trimMaterial.assets().base().suffix() + "_trim");
itemModelGenerator.uploadArmor(identifier4, identifier2,
- Identifier.of(MiddleEarth.MOD_ID, "trims/" + identifierItem.getPath().replaceAll("item", "items") + "_trim" + "_" + trimMaterial.assets().base().suffix()));
+ MiddleEarth.id("trims/" + identifierItem.getPath().replaceAll("item", "items") + "_trim" + "_" + trimMaterial.assets().base().suffix()));
unbaked = ItemModels.basic(identifier4);
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableArmorRecipeProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableArmorRecipeProvider.java
index 9abdee6074..a610bc756a 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableArmorRecipeProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableArmorRecipeProvider.java
@@ -81,7 +81,7 @@ public Identifier getMetalIdentifier(MetalTypes metal){
if (metal.isVanilla()){
return Identifier.of(metal.getName());
} else {
- return Identifier.of(MiddleEarth.MOD_ID, metal.getName());
+ return MiddleEarth.id(metal.getName());
}
}
@@ -93,59 +93,59 @@ protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup wrapp
ItemStack silverArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
silverArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.SILVER.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.SILVER.getName()))), getPattern()));
ItemStack steelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
steelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack steelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
steelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack steelChainmail = new ItemStack(ResourceItemsME.MAIL);
steelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack steelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
steelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack edhelSteelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
edhelSteelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack edhelSteelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
edhelSteelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack edhelSteelChainmail = new ItemStack(ResourceItemsME.MAIL);
edhelSteelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack edhelSteelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
edhelSteelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack khazadSteelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
khazadSteelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack khazadSteelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
khazadSteelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack khazadSteelChainmail = new ItemStack(ResourceItemsME.MAIL);
khazadSteelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack khazadSteelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
khazadSteelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack burzumSteelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
burzumSteelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack burzumSteelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
burzumSteelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack burzumSteelChainmail = new ItemStack(ResourceItemsME.MAIL);
burzumSteelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack burzumSteelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
burzumSteelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack ironArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
ironArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
@@ -159,10 +159,10 @@ protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup wrapp
ItemStack bronzeArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
bronzeArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BRONZE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BRONZE.getName()))), getPattern()));
ItemStack crudeArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
crudeArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.CRUDE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.CRUDE.getName()))), getPattern()));
return new RecipeGenerator(wrapperLookup, recipeExporter) {
@Override
@@ -3237,8 +3237,8 @@ public void generate() {
//region MISTIES
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, EquipmentItemsME.GUNDABAD_BONE_PAULDRON.getDefaultStack(), "chestplate", DispositionType.EVIL)
.input(Items.LEATHER)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.LEATHER)
.input(Items.LEATHER)
.criterion(hasItem(Items.LEATHER),
@@ -3257,7 +3257,7 @@ public void generate() {
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, EquipmentItemsME.GUNDABAD_LEATHER_SCALE_COAT.getDefaultStack(), "chestplate", DispositionType.EVIL, XP_T2)
.input(Items.LEATHER)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.LEATHER)
.input(Items.LEATHER)
.input(Items.LEATHER)
@@ -3356,7 +3356,7 @@ public void generate() {
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, EquipmentItemsME.GUNDABAD_REINFORCED_LEATHER_SCALE_COAT.getDefaultStack(), "chestplate", DispositionType.EVIL, XP_T4)
.input(Items.LEATHER)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.componentInput(new ComponentsIngredient(Ingredient.ofItems(burzumSteelArmorPlate.getItem()), burzumSteelArmorPlate.getComponentChanges()))
.input(EquipmentItemsME.GUNDABAD_LEATHER_SCALE_COAT)
.componentInput(new ComponentsIngredient(Ingredient.ofItems(burzumSteelArmorPlate.getItem()), burzumSteelArmorPlate.getComponentChanges()))
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableGenericArmorRecipeProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableGenericArmorRecipeProvider.java
index ab0e44a9da..1986940a3d 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableGenericArmorRecipeProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableGenericArmorRecipeProvider.java
@@ -77,7 +77,7 @@ public Identifier getMetalIdentifier(MetalTypes metal){
if (metal.isVanilla()){
return Identifier.of(metal.getName());
} else {
- return Identifier.of(MiddleEarth.MOD_ID, metal.getName());
+ return MiddleEarth.id(metal.getName());
}
}
@@ -89,67 +89,67 @@ protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup wrapp
ItemStack silverArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
silverArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.SILVER.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.SILVER.getName()))), getPattern()));
ItemStack bronzeChainmail = new ItemStack(ResourceItemsME.MAIL);
bronzeChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BRONZE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BRONZE.getName()))), getPattern()));
ItemStack crudeChainmail = new ItemStack(ResourceItemsME.MAIL);
crudeChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.CRUDE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.CRUDE.getName()))), getPattern()));
ItemStack steelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
steelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack steelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
steelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack steelChainmail = new ItemStack(ResourceItemsME.MAIL);
steelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack steelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
steelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack edhelSteelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
edhelSteelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack edhelSteelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
edhelSteelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack edhelSteelChainmail = new ItemStack(ResourceItemsME.MAIL);
edhelSteelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack edhelSteelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
edhelSteelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack khazadSteelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
khazadSteelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack khazadSteelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
khazadSteelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack khazadSteelChainmail = new ItemStack(ResourceItemsME.MAIL);
khazadSteelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack khazadSteelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
khazadSteelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack burzumSteelArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
burzumSteelArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack burzumSteelHelmetPlate = new ItemStack(ResourceItemsME.HELMET_PLATE);
burzumSteelHelmetPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack burzumSteelChainmail = new ItemStack(ResourceItemsME.MAIL);
burzumSteelChainmail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack burzumSteelScaleMail = new ItemStack(ResourceItemsME.SCALE_MAIL);
burzumSteelScaleMail.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ItemStack ironArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
ironArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
@@ -163,10 +163,10 @@ protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup wrapp
ItemStack bronzeArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
bronzeArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BRONZE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BRONZE.getName()))), getPattern()));
ItemStack crudeArmorPlate = new ItemStack(ResourceItemsME.ARMOR_PLATE);
crudeArmorPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.CRUDE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.CRUDE.getName()))), getPattern()));
return new RecipeGenerator(wrapperLookup, recipeExporter) {
@Override
@@ -1517,21 +1517,21 @@ public void generate() {
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, EquipmentItemsME.ORCISH_CAPE.getDefaultStack(), "back_attachment", DispositionType.EVIL)
.input(ResourceItemsME.FABRIC)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FABRIC)
.input(ResourceItemsME.FABRIC)
.input(ResourceItemsME.FABRIC)
.input(ResourceItemsME.FABRIC)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.criterion(hasItem(ResourceItemsME.FABRIC),
conditionsFromItem(ResourceItemsME.FABRIC))
.offerTo(exporter);
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, EquipmentItemsME.ORCISH_LONG_CAPE.getDefaultStack(), "back_attachment", DispositionType.EVIL)
.input(ResourceItemsME.FABRIC)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FABRIC)
.input(ResourceItemsME.FABRIC)
.input(ResourceItemsME.FABRIC)
@@ -1559,10 +1559,10 @@ public void generate() {
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FUR)
.input(Items.STRING)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.STRING)
.criterion(hasItem(ResourceItemsME.FUR),
conditionsFromItem(ResourceItemsME.FUR))
@@ -1573,10 +1573,10 @@ public void generate() {
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FUR)
.input(Items.STRING)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.STRING)
.criterion(hasItem(ResourceItemsME.FUR),
conditionsFromItem(ResourceItemsME.FUR))
@@ -1587,10 +1587,10 @@ public void generate() {
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FUR)
.input(Items.STRING)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.STRING)
.criterion(hasItem(ResourceItemsME.FUR),
conditionsFromItem(ResourceItemsME.FUR))
@@ -1601,10 +1601,10 @@ public void generate() {
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FUR)
.input(Items.STRING)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.STRING)
.criterion(hasItem(ResourceItemsME.FUR),
conditionsFromItem(ResourceItemsME.FUR))
@@ -1615,10 +1615,10 @@ public void generate() {
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
.input(ResourceItemsME.FUR)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(ResourceItemsME.FUR)
.input(Items.STRING)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.STRING)
.criterion(hasItem(ResourceItemsME.FUR),
conditionsFromItem(ResourceItemsME.FUR))
@@ -1793,11 +1793,11 @@ public void generate() {
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, EquipmentItemsME.WARG_REINFORCED_LEATHER_ARMOR.getDefaultStack(), "mount_armor", DispositionType.EVIL)
.input(Items.LEATHER)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(EquipmentItemsME.WARG_LEATHER_ARMOR)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.LEATHER)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")))
.input(Items.LEATHER)
.criterion(hasItem(EquipmentItemsME.WARG_LEATHER_ARMOR),
conditionsFromItem(EquipmentItemsME.WARG_LEATHER_ARMOR))
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableHandheldRecipeProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableHandheldRecipeProvider.java
index 2396476437..2d09255199 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableHandheldRecipeProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/ArtisanTableHandheldRecipeProvider.java
@@ -84,7 +84,7 @@ public Identifier getMetalIdentifier(MetalTypes metal){
if (metal.isVanilla()){
return Identifier.of(metal.getName());
} else {
- return Identifier.of(MiddleEarth.MOD_ID, metal.getName());
+ return MiddleEarth.id(metal.getName());
}
}
@@ -409,27 +409,27 @@ public void generate() {
ItemStack bronzeShieldBorder = new ItemStack(ResourceItemsME.SHIELD_BORDER);
bronzeShieldBorder.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BRONZE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BRONZE.getName()))), getPattern()));
ItemStack crudeShieldBorder = new ItemStack(ResourceItemsME.SHIELD_BORDER);
crudeShieldBorder.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.CRUDE.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.CRUDE.getName()))), getPattern()));
ItemStack steelShieldPlate = new ItemStack(ResourceItemsME.SHIELD_PLATE);
steelShieldPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.STEEL.getName()))), getPattern()));
ItemStack edhelSteelShieldPlate = new ItemStack(ResourceItemsME.SHIELD_PLATE);
edhelSteelShieldPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.EDHEL_STEEL.getName()))), getPattern()));
ItemStack khazadSteelShieldPlate = new ItemStack(ResourceItemsME.SHIELD_PLATE);
khazadSteelShieldPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.KHAZAD_STEEL.getName()))), getPattern()));
ItemStack burzumSteelShieldPlate = new ItemStack(ResourceItemsME.SHIELD_PLATE);
burzumSteelShieldPlate.set(DataComponentTypes.TRIM, new ArmorTrim(getArmorTrimMaterialsRegistry().getOrThrow(RegistryKey.of(RegistryKeys.TRIM_MATERIAL,
- Identifier.of(MiddleEarth.MOD_ID, MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
+ MiddleEarth.id(MetalTypes.BURZUM_STEEL.getName()))), getPattern()));
ArtisanTableRecipeJsonBuilder.createArtisanRecipe(itemLookup, RecipeCategory.COMBAT, Items.SHIELD.getDefaultStack(), "medium_shield", DispositionType.NEUTRAL, XP_MEDIUM_SHIELD)
.input(TagKey.of(RegistryKeys.ITEM, Identifier.of("planks")))
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/InscriptionRecipeProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/InscriptionRecipeProvider.java
index 25aedf8b6e..f84dd62f5c 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/InscriptionRecipeProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/InscriptionRecipeProvider.java
@@ -65,7 +65,7 @@ public void generate() {
.addWord("blessing")
.criterion(hasItem(Items.LAPIS_LAZULI),
conditionsFromItem(Items.LAPIS_LAZULI))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_unbreaking_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_unbreaking_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.UNBREAKING), 2, 3)
@@ -74,7 +74,7 @@ public void generate() {
.addWord("blessing")
.criterion(hasItem(Items.LAPIS_LAZULI),
conditionsFromItem(Items.LAPIS_LAZULI))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_unbreaking_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_unbreaking_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.UNBREAKING), 3, 5)
@@ -83,7 +83,7 @@ public void generate() {
.addWord("blessing")
.criterion(hasItem(Items.LAPIS_LAZULI),
conditionsFromItem(Items.LAPIS_LAZULI))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_unbreaking_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_unbreaking_3")));
//endregion
//region THORNS
@@ -94,7 +94,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_thorns_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_thorns_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.THORNS), 2, 6)
@@ -103,7 +103,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_thorns_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_thorns_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.THORNS), 3, 8)
@@ -112,7 +112,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_thorns_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_thorns_3")));
//endregion
//region PROJECTILE PROTECTION
@@ -123,7 +123,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_projectile_protection_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_projectile_protection_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PROJECTILE_PROTECTION), 2, 6)
@@ -132,7 +132,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_projectile_protection_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_projectile_protection_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PROJECTILE_PROTECTION), 3, 8)
@@ -141,7 +141,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_projectile_protection_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_projectile_protection_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PROJECTILE_PROTECTION), 4, 10)
@@ -150,7 +150,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_projectile_protection_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_projectile_protection_4")));
//endregion
//region FIRE PROTECTION
@@ -161,7 +161,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fire_protection_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fire_protection_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FIRE_PROTECTION), 2, 6)
@@ -170,7 +170,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fire_protection_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fire_protection_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FIRE_PROTECTION), 3, 8)
@@ -179,7 +179,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fire_protection_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fire_protection_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FIRE_PROTECTION), 4, 10)
@@ -188,7 +188,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fire_protection_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fire_protection_4")));
//endregion
//region BLAST PROTECTION
@@ -200,7 +200,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_blast_protection_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_blast_protection_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.BLAST_PROTECTION), 2, 6)
@@ -210,7 +210,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_blast_protection_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_blast_protection_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.BLAST_PROTECTION), 3, 8)
@@ -220,7 +220,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_blast_protection_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_blast_protection_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.BLAST_PROTECTION), 4, 10)
@@ -230,7 +230,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_blast_protection_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_blast_protection_4")));
//endregion
//region RESPIRATION
@@ -242,7 +242,7 @@ public void generate() {
.addWord("blessing")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_respiration_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_respiration_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.RESPIRATION), 2, 8)
@@ -252,7 +252,7 @@ public void generate() {
.addWord("blessing")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_respiration_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_respiration_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.RESPIRATION), 3, 11)
@@ -262,7 +262,7 @@ public void generate() {
.addWord("blessing")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_respiration_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_respiration_3")));
//endregion
//region FEATHER FALLING
@@ -274,7 +274,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_feather_falling_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_feather_falling_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FEATHER_FALLING), 2, 5)
@@ -284,7 +284,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_feather_falling_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_feather_falling_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FEATHER_FALLING), 3, 7)
@@ -294,7 +294,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_feather_falling_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_feather_falling_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FEATHER_FALLING), 4, 9)
@@ -304,7 +304,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_feather_falling_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_feather_falling_4")));
//endregion
//region AQUA AFINITY
@@ -316,7 +316,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_aqua_affinity")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_aqua_affinity")));
// endregion
//region DEPTH STRIDER
@@ -328,7 +328,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_depth_strider_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_depth_strider_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.DEPTH_STRIDER), 2, 8)
@@ -338,7 +338,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_depth_strider_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_depth_strider_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.DEPTH_STRIDER), 3, 11)
@@ -348,7 +348,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_depth_strider_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_depth_strider_3")));
//endregion
//region LURE
@@ -360,7 +360,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_lure_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_lure_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.LURE), 2, 4)
@@ -370,7 +370,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_lure_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_lure_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.LURE), 3, 6)
@@ -380,7 +380,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_lure_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_lure_3")));
//endregion
//region SHARPNESS
@@ -391,7 +391,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sharpness_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sharpness_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SHARPNESS), 2, 5)
@@ -400,7 +400,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sharpness_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sharpness_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SHARPNESS), 3, 7)
@@ -409,7 +409,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sharpness_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sharpness_3")));
/*InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SHARPNESS), 4, 9)
@@ -418,7 +418,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sharpness_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sharpness_4")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SHARPNESS), 5, 11)
@@ -427,7 +427,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sharpness_5")));*/
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sharpness_5")));*/
//endregion
//region KNOCKBACK
@@ -438,7 +438,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_knockback_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_knockback_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.KNOCKBACK), 2, 6)
@@ -447,7 +447,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_knockback_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_knockback_2")));
//endregion
//region LOOTING
@@ -459,7 +459,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_looting_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_looting_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.LOOTING), 2, 5)
@@ -469,7 +469,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_looting_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_looting_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.LOOTING), 3, 7)
@@ -479,7 +479,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_looting_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_looting_3")));
//endregion
//region SMITE
@@ -491,7 +491,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_smite_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_smite_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SMITE), 2, 5)
@@ -501,7 +501,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_smite_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_smite_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SMITE), 3, 7)
@@ -511,7 +511,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_smite_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_smite_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SMITE), 4, 9)
@@ -521,7 +521,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_smite_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_smite_4")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SMITE), 5, 11)
@@ -531,7 +531,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_smite_5")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_smite_5")));
//endregion
//region SWEEPING EDGE
@@ -543,7 +543,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sweeping_edge_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sweeping_edge_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SWEEPING_EDGE), 2, 5)
@@ -553,7 +553,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sweeping_edge_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sweeping_edge_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.SWEEPING_EDGE), 3, 7)
@@ -563,7 +563,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_sweeping_edge_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_sweeping_edge_3")));
//endregion
//region POWER
@@ -574,7 +574,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_power_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_power_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.POWER), 2, 5)
@@ -583,7 +583,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_power_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_power_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.POWER), 3, 7)
@@ -592,7 +592,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_power_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_power_3")));
/*InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.POWER), 4, 9)
@@ -601,7 +601,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_power_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_power_4")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.POWER), 5, 11)
@@ -610,7 +610,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_power_5")));*/
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_power_5")));*/
//endregion
//region PUNCH
@@ -621,7 +621,7 @@ public void generate() {
.addWord("draw")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_punch_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_punch_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PUNCH), 2, 8)
@@ -630,7 +630,7 @@ public void generate() {
.addWord("draw")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_punch_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_punch_2")));
//endregion
//region PIERCING
@@ -641,7 +641,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_piercing_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_piercing_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PIERCING), 2, 5)
@@ -650,7 +650,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_piercing_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_piercing_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PIERCING), 3, 7)
@@ -659,7 +659,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_piercing_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_piercing_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.PIERCING), 4, 9)
@@ -668,7 +668,7 @@ public void generate() {
.addWord("point")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_piercing_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_piercing_4")));
//endregion
@@ -680,7 +680,7 @@ public void generate() {
.addWord("draw")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_quick_charge_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_quick_charge_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.QUICK_CHARGE), 2, 6)
@@ -689,7 +689,7 @@ public void generate() {
.addWord("draw")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_quick_charge_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_quick_charge_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.QUICK_CHARGE), 3, 8)
@@ -698,7 +698,7 @@ public void generate() {
.addWord("draw")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_quick_charge_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_quick_charge_3")));
//endregion
//region EFFICIENCY
@@ -709,7 +709,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_efficiency_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_efficiency_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.EFFICIENCY), 2, 4)
@@ -718,7 +718,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_efficiency_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_efficiency_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.EFFICIENCY), 3, 6)
@@ -727,7 +727,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_efficiency_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_efficiency_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.EFFICIENCY), 4, 8)
@@ -736,7 +736,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_efficiency_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_efficiency_4")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.EFFICIENCY), 5, 10)
@@ -745,7 +745,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_efficiency_5")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_efficiency_5")));
//endregion
//region FORTUNE
@@ -757,7 +757,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fortune_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fortune_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FORTUNE), 2, 9)
@@ -767,7 +767,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fortune_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fortune_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(Enchantments.FORTUNE), 3, 11)
@@ -777,7 +777,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_fortune_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_fortune_3")));
//endregion
//region SILK TOUCH
@@ -788,7 +788,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_silk_touch")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_silk_touch")));
//endregion
@@ -802,7 +802,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_ailment_protection_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_ailment_protection_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.AILMENT_PROTECTION), 2, 6)
@@ -812,7 +812,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_ailment_protection_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_ailment_protection_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.AILMENT_PROTECTION), 3, 8)
@@ -822,7 +822,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_ailment_protection_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_ailment_protection_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.AILMENT_PROTECTION), 4, 10)
@@ -832,7 +832,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_ailment_protection_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_ailment_protection_4")));
//endregion
//region AULE BLESSING
@@ -843,7 +843,7 @@ public void generate() {
.addWord("core")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_aule_blessing_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_aule_blessing_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.AILMENT_PROTECTION), 2, 6)
@@ -852,7 +852,7 @@ public void generate() {
.addWord("core")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_aule_blessing_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_aule_blessing_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.AILMENT_PROTECTION), 3, 8)
@@ -861,7 +861,7 @@ public void generate() {
.addWord("core")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_aule_blessing_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_aule_blessing_3")));
//endregion
//region BANE OF GIANTS
@@ -873,7 +873,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_bane_of_giants_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_bane_of_giants_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.BANE_OF_GIANTS), 2, 5)
@@ -883,7 +883,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_bane_of_giants_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_bane_of_giants_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.BANE_OF_GIANTS), 3, 7)
@@ -893,7 +893,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_bane_of_giants_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_bane_of_giants_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.BANE_OF_GIANTS), 4, 9)
@@ -903,7 +903,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_bane_of_giants_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_bane_of_giants_4")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.BANE_OF_GIANTS), 5, 11)
@@ -913,7 +913,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_bane_of_giants_5")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_bane_of_giants_5")));
//endregion
//region CELERITY
@@ -924,7 +924,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_celerity")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_celerity")));
//endregion
//region GROUNDED
@@ -936,7 +936,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_grounded_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_grounded_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.GROUNDED), 2, 7)
@@ -946,7 +946,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_grounded_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_grounded_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.GROUNDED), 3, 9)
@@ -956,7 +956,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_grounded_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_grounded_3")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.GROUNDED), 4, 11)
@@ -966,7 +966,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_grounded_4")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_grounded_4")));
//endregion
//region HEWING
@@ -977,7 +977,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_hewing_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_hewing_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.HEWING), 2, 7)
@@ -986,7 +986,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_hewing_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_hewing_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.HEWING), 3, 9)
@@ -995,7 +995,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_hewing_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_hewing_3")));
//endregion
//region TREE_FELLER
@@ -1006,7 +1006,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_tree_feller_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_tree_feller_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.TREE_FELLER), 2, 7)
@@ -1015,7 +1015,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_tree_feller_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_tree_feller_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.TREE_FELLER), 3, 9)
@@ -1024,7 +1024,7 @@ public void generate() {
.addWord("cutter")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_tree_feller_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_tree_feller_3")));
//endregion
//region HIGH STEP
@@ -1035,7 +1035,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_high_step")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_high_step")));
//endregion
//region MINER_REACH
@@ -1046,7 +1046,7 @@ public void generate() {
.addWord("collector")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_miner_reach")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_miner_reach")));
//endregion
//region STEALTHY_TRAIL
@@ -1057,7 +1057,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stealthy_trail_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stealthy_trail_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.STEALTHY_TRAIL), 2, 5)
@@ -1066,7 +1066,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stealthy_trail_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stealthy_trail_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.STEALTHY_TRAIL), 3, 7)
@@ -1075,7 +1075,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.RUBY),
conditionsFromItem(ResourceItemsME.RUBY))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stealthy_trail_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stealthy_trail_3")));
//endregion
//region STALWART
@@ -1087,7 +1087,7 @@ public void generate() {
.addWord("warded")
.criterion(hasItem(ResourceItemsME.SAPPHIRE),
conditionsFromItem(ResourceItemsME.SAPPHIRE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stalwart")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stalwart")));
//endregion
//region STRIDE
@@ -1098,7 +1098,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stride_1")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stride_1")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.STRIDE), 2, 5)
@@ -1107,7 +1107,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stride_2")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stride_2")));
InscriptionRecipeJsonBuilder.createInscriptionRecipe(itemLookup, RecipeCategory.MISC,
getEnchantment(EnchantmentsME.STRIDE), 3, 7)
@@ -1116,7 +1116,7 @@ public void generate() {
.addWord("traveller")
.criterion(hasItem(ResourceItemsME.ADAMANT),
conditionsFromItem(ResourceItemsME.ADAMANT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_stride_3")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_stride_3")));
//endregion
//region VANTAGE
@@ -1127,7 +1127,7 @@ public void generate() {
.addWord("edge")
.criterion(hasItem(Items.EMERALD),
conditionsFromItem(Items.EMERALD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "inscription_vantage")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("inscription_vantage")));
//endregion
}
};
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/RecipeProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/RecipeProvider.java
index 0055fc9209..ae80e1c6da 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/RecipeProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/recipes/RecipeProvider.java
@@ -226,7 +226,7 @@ public void generate() {
.input(record.logBlocks.wood())
.criterion(hasItem(record.logBlocks.wood()),
conditionsFromItem(record.planksBlocks.base()))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(record.planksBlocks.base()).getPath() + "_from_wood")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(record.planksBlocks.base()).getPath() + "_from_wood")));
}
} else if(record.mushroomStemBlocks != null) {
@@ -263,13 +263,13 @@ public void generate() {
.input(record.strippedLogBlocks.log())
.criterion(hasItem(record.strippedLogBlocks.log()),
conditionsFromItem(record.planksBlocks.base()))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(record.planksBlocks.base()).getPath() + "_from_stripped_log")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(record.planksBlocks.base()).getPath() + "_from_stripped_log")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, record.planksBlocks.base(), 4)
.input(record.strippedLogBlocks.wood())
.criterion(hasItem(record.strippedLogBlocks.wood()),
conditionsFromItem(record.planksBlocks.base()))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(record.planksBlocks.base()).getPath() + "_from_stripped_wood")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(record.planksBlocks.base()).getPath() + "_from_stripped_wood")));
}
createFenceRecipe(exporter, record.planksBlocks.base().asItem(), record.planksBlocks.fence());
@@ -996,58 +996,58 @@ public void generate() {
//region Alloying
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "bronze", INGOT_LIQUID_VALUE * 4, 4)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "copper")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "copper")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "copper")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "tin")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("copper")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("copper")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("copper")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("tin")))
.criterion(hasItem(Items.COPPER_INGOT),
conditionsFromItem(Items.COPPER_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "bronze" + "_from_alloying")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("bronze" + "_from_alloying")));
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "crude", INGOT_LIQUID_VALUE * 3, 3)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "copper")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "copper")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "tin")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("copper")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("copper")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("tin")))
.input(ResourceItemsME.ASH)
.criterion(hasItem(Items.COPPER_INGOT),
conditionsFromItem(Items.COPPER_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "crude" + "_from_alloying")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("crude" + "_from_alloying")));
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "steel", INGOT_LIQUID_VALUE * 3, 3)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
.input(Items.COAL)
.criterion(hasItem(Items.IRON_INGOT),
conditionsFromItem(Items.IRON_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "steel" + "_from_alloying_tags")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("steel" + "_from_alloying_tags")));
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "khazad_steel", INGOT_LIQUID_VALUE * 3, 3)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "lead")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("lead")))
.input(Items.COAL)
.criterion(hasItem(Items.IRON_INGOT),
conditionsFromItem(Items.IRON_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "khazad_steel" + "_from_alloying_tags")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("khazad_steel" + "_from_alloying_tags")));
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "edhel_steel", INGOT_LIQUID_VALUE * 3, 3)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
.input(ResourceItemsME.SILVER_NUGGET)
.criterion(hasItem(Items.IRON_INGOT),
conditionsFromItem(Items.IRON_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "edhel_steel" + "_from_alloying_tags")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("edhel_steel" + "_from_alloying_tags")));
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "burzum_steel", INGOT_LIQUID_VALUE * 3, 3)
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")))
- .input(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "lead")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")))
+ .input(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("lead")))
.input(ResourceItemsME.ASH)
.criterion(hasItem(Items.IRON_INGOT),
conditionsFromItem(Items.IRON_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "burzum_steel" + "_from_alloying_tags")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("burzum_steel" + "_from_alloying_tags")));
AlloyRecipeJsonBuilder.createAlloyRecipe(itemLookup, RecipeCategory.MISC, "chicken_nugget", INGOT_LIQUID_VALUE, 1)
.input(Items.CHICKEN)
@@ -1056,7 +1056,7 @@ public void generate() {
.input(FoodItemsME.GARLIC)
.criterion(hasItem(ResourceItemsME.PTEROSAUR_NUGGET),
conditionsFromItem(ResourceItemsME.PTEROSAUR_NUGGET))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "chicken_nugget" + "_from_alloying")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("chicken_nugget" + "_from_alloying")));
HotMetalsModel.nuggets.forEach(nugget -> {
@@ -1069,23 +1069,23 @@ public void generate() {
createAnvilShapingRecipeItem(exporter, shape.item(), shape.output(), shape.amount());
});
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "copper")), "copper");
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "tin")), "tin");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("copper")), "copper");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("tin")), "tin");
createMeltBulkRecipe(exporter, ResourceItemsME.BRONZE_INGOT, "bronze");
createMeltBulkRecipe(exporter, ResourceItemsME.CRUDE_INGOT, "crude");
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "lead")), "lead");
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "silver")), "silver");
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "iron")), "iron");
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "gold")), "gold");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("lead")), "lead");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("silver")), "silver");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("iron")), "iron");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("gold")), "gold");
createMeltBulkRecipe(exporter, ResourceItemsME.STEEL_INGOT, "steel");
createMeltBulkRecipe(exporter, ResourceItemsME.KHAZAD_STEEL_INGOT, "khazad_steel");
createMeltBulkRecipe(exporter, ResourceItemsME.EDHEL_STEEL_INGOT, "edhel_steel");
createMeltBulkRecipe(exporter, ResourceItemsME.BURZUM_STEEL_INGOT, "burzum_steel");
- createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "mithril")), "mithril");
+ createMeltBulkRecipeTag(exporter, TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("mithril")), "mithril");
createMeltBulkRecipe(exporter, Items.NETHERITE_INGOT, "netherite");
@@ -1162,7 +1162,7 @@ public void generate() {
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, BlockRegistryME.TREATED_STEEL_BARS, 16)
.pattern("SSS")
.pattern("SSS")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.criterion(hasItem(ResourceItemsME.STEEL_INGOT),
conditionsFromItem(ResourceItemsME.STEEL_INGOT))
.offerTo(exporter);
@@ -1215,8 +1215,8 @@ public void generate() {
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, BlockRegistryME.TREATED_STEEL_TRAPDOOR, 2)
.pattern("NSN")
.pattern("NSN")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
- .input('N', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
+ .input('N', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.criterion(hasItem(ResourceItemsME.STEEL_INGOT),
conditionsFromItem(ResourceItemsME.STEEL_INGOT))
.offerTo(exporter);
@@ -1252,7 +1252,7 @@ public void generate() {
.pattern("SS")
.pattern("SS")
.pattern("SS")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.criterion(hasItem(ResourceItemsME.STEEL_INGOT),
conditionsFromItem(ResourceItemsME.STEEL_INGOT))
.offerTo(exporter);
@@ -1336,7 +1336,7 @@ public void generate() {
.input(GenericBlockSetRegistryME.AGED_WOOD.blockSet.base())
.criterion(hasItem(GenericBlockSetRegistryME.AGED_WOOD.blockSet.base()),
conditionsFromItem(GenericBlockSetRegistryME.AGED_WOOD.blockSet.base()))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(GenericBlockSetRegistryME.AGED_WOOD_PLANKS.blockSet.base()).getPath() + "_from_wood")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(GenericBlockSetRegistryME.AGED_WOOD_PLANKS.blockSet.base()).getPath() + "_from_wood")));
createBrickRecipe(exporter, GenericBlockSetRegistryME.AGED_WOOD_PLANKS.blockSet.base().asItem(), GenericBlockSetRegistryME.AGED_WOOD_PANELS.blockSet.base(), 4);
@@ -1509,7 +1509,7 @@ public void generate() {
.pattern("CNC")
.pattern("N N")
.input('C', TagKey.of(RegistryKeys.ITEM, Identifier.of("candles")))
- .input('N', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('N', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.criterion(hasItem(Items.CANDLE),
conditionsFromItem(Items.CANDLE))
.offerTo(exporter);
@@ -1519,7 +1519,7 @@ public void generate() {
.pattern("N N")
.input('C', TagKey.of(RegistryKeys.ITEM, Identifier.of("candles")))
.input('H', DecorativeBlockRegistryME.SMALL_CHANDELIER)
- .input('N', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('N', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.criterion(hasItem(Items.CANDLE),
conditionsFromItem(Items.CANDLE))
.offerTo(exporter);
@@ -1814,8 +1814,8 @@ public void generate() {
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, DecorativeItemsME.SCONCE, 4)
.pattern("NTN")
.pattern(" I ")
- .input('N', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
- .input('I', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('N', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
+ .input('I', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.input('T', Items.TORCH)
.criterion(hasItem(Items.TORCH),
conditionsFromItem(Items.TORCH))
@@ -1851,7 +1851,7 @@ public void generate() {
.pattern("LLL")
.pattern("LSL")
.pattern("LLL")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.input('L', WoodBlockSetRegistryME.LARCH_SET.planksBlocks.base())
.criterion(hasItem(WoodBlockSetRegistryME.LARCH_SET.planksBlocks.base()),
conditionsFromItem(WoodBlockSetRegistryME.LARCH_SET.planksBlocks.base()))
@@ -1861,7 +1861,7 @@ public void generate() {
.pattern("LSL")
.pattern("SLL")
.pattern("LSL")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.input('L', Items.SPRUCE_PLANKS)
.criterion(hasItem(Items.SPRUCE_PLANKS),
conditionsFromItem(Items.SPRUCE_PLANKS))
@@ -1925,7 +1925,7 @@ public void generate() {
.pattern("SP")
.pattern("PP")
.pattern("SP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.input('P', WoodBlockSetRegistryME.BLACK_PINE_SET.planksBlocks.base())
.criterion(hasItem(WoodBlockSetRegistryME.BLACK_PINE_SET.planksBlocks.base()),
conditionsFromItem(WoodBlockSetRegistryME.BLACK_PINE_SET.planksBlocks.base()))
@@ -1934,7 +1934,7 @@ public void generate() {
.pattern("SP")
.pattern("PP")
.pattern("SP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.input('P', WoodBlockSetRegistryME.FIR_SET.planksBlocks.base())
.criterion(hasItem(WoodBlockSetRegistryME.FIR_SET.planksBlocks.base()),
conditionsFromItem(WoodBlockSetRegistryME.FIR_SET.planksBlocks.base()))
@@ -1944,7 +1944,7 @@ public void generate() {
.pattern("SPP")
.pattern("PPP")
.pattern("SPP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.input('P', Items.OAK_PLANKS)
.criterion(hasItem(Items.OAK_PLANKS),
conditionsFromItem(Items.OAK_PLANKS))
@@ -1954,7 +1954,7 @@ public void generate() {
.pattern("SPP")
.pattern("SPS")
.pattern("SPP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.input('P', WoodBlockSetRegistryME.BLACK_PINE_SET.planksBlocks.base())
.criterion(hasItem(WoodBlockSetRegistryME.BLACK_PINE_SET.planksBlocks.base()),
conditionsFromItem(WoodBlockSetRegistryME.BLACK_PINE_SET.planksBlocks.base()))
@@ -1964,7 +1964,7 @@ public void generate() {
.pattern("SPP")
.pattern("SPS")
.pattern("SPP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.input('P', Items.SPRUCE_PLANKS)
.criterion(hasItem(Items.SPRUCE_PLANKS),
conditionsFromItem(Items.SPRUCE_PLANKS))
@@ -1974,7 +1974,7 @@ public void generate() {
.pattern("SPP")
.pattern("PPP")
.pattern("SPP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.input('P', WoodBlockSetRegistryME.LARCH_SET.planksBlocks.base())
.criterion(hasItem(WoodBlockSetRegistryME.LARCH_SET.planksBlocks.base()),
conditionsFromItem(WoodBlockSetRegistryME.LARCH_SET.planksBlocks.base()))
@@ -1986,7 +1986,7 @@ public void generate() {
.pattern("SPP")
.pattern("PPP")
.pattern("SPP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.input('P', Items.SPRUCE_PLANKS)
.criterion(hasItem(Items.SPRUCE_PLANKS),
conditionsFromItem(Items.SPRUCE_PLANKS))
@@ -1996,7 +1996,7 @@ public void generate() {
.pattern("SPP")
.pattern("PPP")
.pattern("SPP")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.input('P', TagKey.of(RegistryKeys.ITEM, Identifier.of("planks")))
.criterion(hasItem(Items.OAK_PLANKS),
conditionsFromItem(Items.OAK_PLANKS))
@@ -2271,7 +2271,7 @@ public void generate() {
.pattern("S")
.pattern("S")
.pattern("S")
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.criterion(hasItem(ResourceItemsME.STEEL_INGOT),
conditionsFromItem(ResourceItemsME.STEEL_INGOT))
.offerTo(exporter);
@@ -2280,11 +2280,11 @@ public void generate() {
.pattern("N")
.pattern("I")
.pattern("N")
- .input('N', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
- .input('I', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('N', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
+ .input('I', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.criterion(hasItem(ResourceItemsME.STEEL_INGOT),
conditionsFromItem(ResourceItemsME.STEEL_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(Items.CHAIN).getPath() + "_alt")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(Items.CHAIN).getPath() + "_alt")));
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, DecorativeBlockRegistryME.BRONZE_CHAIN, 4)
.pattern("N")
@@ -2330,8 +2330,8 @@ public void generate() {
.pattern(" N ")
.pattern("NIN")
.pattern(" N ")
- .input('I', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
- .input('N', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_nuggets")))
+ .input('I', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
+ .input('N', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_nuggets")))
.criterion(hasItem(ResourceItemsME.STEEL_INGOT),
conditionsFromItem(ResourceItemsME.STEEL_INGOT))
.offerTo(exporter);
@@ -2367,7 +2367,7 @@ public void generate() {
.pattern("SSS")
.input('B', BlockRegistryME.TREATED_STEEL_BARS)
.input('C', Items.CAMPFIRE)
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.criterion(hasItem(Items.CAMPFIRE),
conditionsFromItem(Items.CAMPFIRE))
.offerTo(exporter);
@@ -2388,7 +2388,7 @@ public void generate() {
.pattern("SSS")
.input('B', BlockRegistryME.TREATED_STEEL_BARS)
.input('C', Items.CAMPFIRE)
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.criterion(hasItem(Items.CAMPFIRE),
conditionsFromItem(Items.CAMPFIRE))
.offerTo(exporter);
@@ -2407,7 +2407,7 @@ public void generate() {
.pattern("SCS")
.pattern("SSS")
.input('C', Items.CAMPFIRE)
- .input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "steel_ingots")))
+ .input('S', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("steel_ingots")))
.criterion(hasItem(Items.CAMPFIRE),
conditionsFromItem(Items.CAMPFIRE))
.offerTo(exporter);
@@ -2452,7 +2452,7 @@ public void generate() {
.pattern("V V")
.pattern("VSV")
.input('S', TagKey.of(RegistryKeys.ITEM, Identifier.of("wooden_slabs")))
- .input('V', TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "wooden_vertical_slabs")))
+ .input('V', TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("wooden_vertical_slabs")))
.criterion(hasItem(Items.OAK_SLAB),
conditionsFromItem(Items.OAK_SLAB))
.offerTo(exporter);
@@ -2588,10 +2588,10 @@ public void generate() {
CookingRecipeJsonBuilder.createSmoking(Ingredient.ofTag(itemLookup.getOrThrow(TagKey.of(RegistryKeys.ITEM, Identifier.of("planks")))), RecipeCategory.BUILDING_BLOCKS, WoodBlockSetRegistryME.SCORCHED_SET.planksBlocks.base(), 0.0f, 100)
.criterion(hasItem(Items.OAK_PLANKS),
- conditionsFromItem(Items.OAK_PLANKS)).offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(WoodBlockSetRegistryME.SCORCHED_SET.planksBlocks.base()).getPath() + "_from_smoking")));
+ conditionsFromItem(Items.OAK_PLANKS)).offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(WoodBlockSetRegistryME.SCORCHED_SET.planksBlocks.base()).getPath() + "_from_smoking")));
CookingRecipeJsonBuilder.createSmoking(Ingredient.ofTag(itemLookup.getOrThrow(TagKey.of(RegistryKeys.ITEM, Identifier.of("logs")))), RecipeCategory.BUILDING_BLOCKS, WoodBlockSetRegistryME.SCORCHED_SET.logBlocks.log(), 0.0f, 100)
.criterion(hasItem(Items.OAK_LOG),
- conditionsFromItem(Items.OAK_LOG)).offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(WoodBlockSetRegistryME.SCORCHED_SET.logBlocks.log()).getPath() + "_from_smoking")));
+ conditionsFromItem(Items.OAK_LOG)).offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(WoodBlockSetRegistryME.SCORCHED_SET.logBlocks.log()).getPath() + "_from_smoking")));
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, NatureBlockRegistryME.SHORT_ICICLES, 4)
.pattern("III")
@@ -2617,7 +2617,7 @@ public void generate() {
.input('T', ResourceItemsME.TIN_INGOT)
.criterion(hasItem(ResourceItemsME.TIN_INGOT),
conditionsFromItem(ResourceItemsME.TIN_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(Items.BUCKET).getPath() + "_alt")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(Items.BUCKET).getPath() + "_alt")));
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, Items.CAULDRON, 1)
.pattern("T T")
@@ -2627,7 +2627,7 @@ public void generate() {
.input('B', BlockRegistryME.TIN_BLOCK)
.criterion(hasItem(ResourceItemsME.TIN_INGOT),
conditionsFromItem(ResourceItemsME.TIN_INGOT))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(Items.CAULDRON).getPath() + "_alt")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(Items.CAULDRON).getPath() + "_alt")));
createCenterSurroundRecipe(exporter, Blocks.TUFF.asItem(), Items.RAW_COPPER, StoneBlockSetRegistryME.GREEN_TUFF_SET.baseBlocks.base().asItem(), 8);
createCenterSurroundRecipe(exporter, StoneBlockSetRegistryME.SLATE_SET.baseBlocks.base().asItem(), Items.RAW_COPPER, StoneBlockSetRegistryME.KHAGALABAN_SET.baseBlocks.base().asItem(), 8);
@@ -2803,37 +2803,37 @@ public void generate() {
.input(DecorativeBlockRegistryME.COPPER_TREASURE_HEAP_LAYER)
.criterion(hasItem(DecorativeBlockRegistryME.COPPER_TREASURE_HEAP_LAYER),
conditionsFromItem(DecorativeBlockRegistryME.COPPER_TREASURE_HEAP_LAYER))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "copper_coin_from_treasure")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("copper_coin_from_treasure")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, ResourceItemsME.SILVER_COIN, 3)
.input(DecorativeBlockRegistryME.SILVER_TREASURE_HEAP_LAYER)
.criterion(hasItem(DecorativeBlockRegistryME.SILVER_TREASURE_HEAP_LAYER),
conditionsFromItem(DecorativeBlockRegistryME.SILVER_TREASURE_HEAP_LAYER))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "silver_coin_from_treasure")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("silver_coin_from_treasure")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, ResourceItemsME.GOLD_COIN, 3)
.input(DecorativeBlockRegistryME.GOLD_TREASURE_HEAP_LAYER)
.criterion(hasItem(DecorativeBlockRegistryME.GOLD_TREASURE_HEAP_LAYER),
conditionsFromItem(DecorativeBlockRegistryME.GOLD_TREASURE_HEAP_LAYER))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "gold_nugget_from_treasure")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("gold_nugget_from_treasure")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, ResourceItemsME.COPPER_COIN, 4)
.input(DecorativeBlockRegistryME.COPPER_COIN_PILE)
.criterion(hasItem(DecorativeBlockRegistryME.COPPER_COIN_PILE),
conditionsFromItem(DecorativeBlockRegistryME.COPPER_COIN_PILE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "copper_coin_from_pile")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("copper_coin_from_pile")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, ResourceItemsME.SILVER_COIN, 4)
.input(DecorativeBlockRegistryME.SILVER_COIN_PILE)
.criterion(hasItem(DecorativeBlockRegistryME.SILVER_COIN_PILE),
conditionsFromItem(DecorativeBlockRegistryME.SILVER_COIN_PILE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "silver_coin_from_pile")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("silver_coin_from_pile")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, ResourceItemsME.GOLD_COIN, 4)
.input(DecorativeBlockRegistryME.GOLD_COIN_PILE)
.criterion(hasItem(DecorativeBlockRegistryME.GOLD_COIN_PILE),
conditionsFromItem(DecorativeBlockRegistryME.GOLD_COIN_PILE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "gold_nugget_from_pile")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("gold_nugget_from_pile")));
ShapelessRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, NatureBlockRegistryME.SHORT_BULRUSH, 2)
.input(NatureBlockRegistryME.TALL_BULRUSH)
@@ -2869,7 +2869,7 @@ public void generate() {
.input(DecorativeBlockRegistryME.POT_OF_GOLD)
.criterion(hasItem(DecorativeBlockRegistryME.POT_OF_GOLD),
conditionsFromItem(DecorativeBlockRegistryME.POT_OF_GOLD))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, "gold_from_pot_of_gold")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id("gold_from_pot_of_gold")));
ShapedRecipeJsonBuilder.create(itemLookup, RecipeCategory.BUILDING_BLOCKS, WeaponItemsME.HELD_BANNER, 1)
.pattern("WWW")
@@ -3038,14 +3038,14 @@ private void createMossyRecipe(RecipeExporter exporter, Block input, Block outpu
.input(Items.VINE)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(output).getPath() + "_vine")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(output).getPath() + "_vine")));
ShapelessRecipeJsonBuilder.create(this.itemLookup, RecipeCategory.BUILDING_BLOCKS, output, 1)
.input(input)
.input(Blocks.MOSS_BLOCK)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(output).getPath() + "_moss")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(output).getPath() + "_moss")));
}
private void createSmeltingRecipe(RecipeExporter exporter, Item input, Item output) {
@@ -3059,7 +3059,7 @@ private void createSmeltingRecipeIdentifier(RecipeExporter exporter, Item input,
CookingRecipeJsonBuilder.createSmelting(Ingredient.ofItems(input), RecipeCategory.BUILDING_BLOCKS, output, 0.1f, 200)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(output).getPath() + "_from_smelting")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(output).getPath() + "_from_smelting")));
}
private void createMeltBulkRecipe(RecipeExporter exporter, Item input, String output) {
@@ -3075,20 +3075,20 @@ private void createMeltRecipe(RecipeExporter exporter, Item input, String output
.input(input)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_1_" + Registries.ITEM.getId(input).getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_1_" + Registries.ITEM.getId(input).getPath())));
case 2 -> AlloyRecipeJsonBuilder.createAlloyRecipe(this.itemLookup, RecipeCategory.MISC, output, amount * 2, 0)
.input(input)
.input(input)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_2_" + Registries.ITEM.getId(input).getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_2_" + Registries.ITEM.getId(input).getPath())));
case 3 -> AlloyRecipeJsonBuilder.createAlloyRecipe(this.itemLookup, RecipeCategory.MISC, output, amount * 3,0)
.input(input)
.input(input)
.input(input)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_3_" + Registries.ITEM.getId(input).getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_3_" + Registries.ITEM.getId(input).getPath())));
case 4 -> AlloyRecipeJsonBuilder.createAlloyRecipe(this.itemLookup, RecipeCategory.MISC, output, amount * 4, 0)
.input(input)
.input(input)
@@ -3096,7 +3096,7 @@ private void createMeltRecipe(RecipeExporter exporter, Item input, String output
.input(input)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_4_" + Registries.ITEM.getId(input).getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_4_" + Registries.ITEM.getId(input).getPath())));
}
}
@@ -3113,20 +3113,20 @@ private void createMeltRecipeTag(RecipeExporter exporter, TagKey input, String o
.input(input)
.criterion(hasItem(DecorativeItemsME.FORGE),
conditionsFromItem(DecorativeItemsME.FORGE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_1_" + input.id().getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_1_" + input.id().getPath())));
case 2 -> AlloyRecipeJsonBuilder.createAlloyRecipe(this.itemLookup, RecipeCategory.MISC, output, amount * 2, 0)
.input(input)
.input(input)
.criterion(hasItem(DecorativeItemsME.FORGE),
conditionsFromItem(DecorativeItemsME.FORGE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_2_" + input.id().getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_2_" + input.id().getPath())));
case 3 -> AlloyRecipeJsonBuilder.createAlloyRecipe(this.itemLookup, RecipeCategory.MISC, output, amount * 3, 0)
.input(input)
.input(input)
.input(input)
.criterion(hasItem(DecorativeItemsME.FORGE),
conditionsFromItem(DecorativeItemsME.FORGE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_3_" + input.id().getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_3_" + input.id().getPath())));
case 4 -> AlloyRecipeJsonBuilder.createAlloyRecipe(this.itemLookup, RecipeCategory.MISC, output, amount * 4, 0)
.input(input)
.input(input)
@@ -3134,7 +3134,7 @@ private void createMeltRecipeTag(RecipeExporter exporter, TagKey input, String o
.input(input)
.criterion(hasItem(DecorativeItemsME.FORGE),
conditionsFromItem(DecorativeItemsME.FORGE))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, output + "_from_melting_4_" + input.id().getPath())));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(output + "_from_melting_4_" + input.id().getPath())));
}
}
@@ -3205,7 +3205,7 @@ private void createSlabsFromVerticalRecipe(RecipeExporter exporter, Block input,
.input(input)
.criterion(hasItem(input),
conditionsFromItem(input))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.BLOCK.getId(input).getPath() + "_from_vertical")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.BLOCK.getId(input).getPath() + "_from_vertical")));
}
private void createVerticalSlabsRecipe(RecipeExporter exporter, Block input, Block output) {
@@ -3267,7 +3267,7 @@ private void createCenterSurroundRecipe(RecipeExporter exporter, Item surroundIn
.input('D', centerItem)
.criterion(hasItem(surroundInput),
conditionsFromItem(surroundInput))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(output).getPath() + "_alt")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(output).getPath() + "_alt")));
}
private void createDyeableItemRecipe(RecipeExporter exporter, Block blockInput, Item dyeItem, Block output) {
@@ -3762,13 +3762,13 @@ private void createMetalsRecipe(RecipeExporter exporter, Item nugget, Item ingot
.input(nugget, 9)
.criterion(hasItem(nugget),
conditionsFromItem(nugget))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(ingot).getPath() + "_from_nuggets")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(ingot).getPath() + "_from_nuggets")));
ShapelessRecipeJsonBuilder.create(this.itemLookup, RecipeCategory.MISC, nugget, 9)
.input(ingot)
.criterion(hasItem(ingot),
conditionsFromItem(ingot))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(nugget).getPath() + "_from_ingot")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(nugget).getPath() + "_from_ingot")));
createFilledRecipe(exporter, ingot, block, 1);
@@ -3776,7 +3776,7 @@ private void createMetalsRecipe(RecipeExporter exporter, Item nugget, Item ingot
.input(block)
.criterion(hasItem(block),
conditionsFromItem(block))
- .offerTo(exporter, String.valueOf(Identifier.of(MiddleEarth.MOD_ID, Registries.ITEM.getId(ingot).getPath() + "_from_block")));
+ .offerTo(exporter, String.valueOf(MiddleEarth.id(Registries.ITEM.getId(ingot).getPath() + "_from_block")));
}
//endregion
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/BlockTagProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/BlockTagProvider.java
index 5b3641d8be..66b5ff76cd 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/BlockTagProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/BlockTagProvider.java
@@ -40,8 +40,8 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
var climbable = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of("climbable")));
var impermeable = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of("impermeable")));
- var seat = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "seat")));
- var table = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "table")));
+ var seat = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("seat")));
+ var table = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("table")));
var leaves = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of("leaves")));
@@ -49,7 +49,7 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
var snapsGoatHorn = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of("snaps_goat_horn")));
- var cobwebs = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "cobwebs")));
+ var cobwebs = valueLookupBuilder(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("cobwebs")));
mineableAxe.add(MineableAxe.blocks.toArray(new Block[0]));
mineablePickaxe.add(MineablePickaxe.blocks.toArray(new Block[0]));
@@ -84,10 +84,10 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
TagKey copper_ores = TagKey.of(RegistryKeys.BLOCK, Identifier.of( "copper_ores"));
TagKey coal_ores = TagKey.of(RegistryKeys.BLOCK, Identifier.of( "coal_ores"));
- TagKey tin_ores = TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "tin_ores"));
- TagKey lead_ores = TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "lead_ores"));
- TagKey silver_ores = TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "silver_ores"));
- TagKey mithril_ores = TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "mithril_ores"));
+ TagKey tin_ores = TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("tin_ores"));
+ TagKey lead_ores = TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("lead_ores"));
+ TagKey silver_ores = TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("silver_ores"));
+ TagKey mithril_ores = TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("mithril_ores"));
for (OreStoneSetRegistryME.OreRockSet set : OreStoneSetRegistryME.sets) {
if(set.coal_ore() != null) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/ItemTagProvider.java b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/ItemTagProvider.java
index 8eddd0dabf..f5cadd73ca 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/ItemTagProvider.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/datageneration/providers/tags/ItemTagProvider.java
@@ -32,17 +32,17 @@ public ItemTagProvider(FabricDataOutput output, CompletableFuture saplings = TagKey.of(RegistryKeys.ITEM, Identifier.of("saplings"));
TagKey- wooden_slabs = TagKey.of(RegistryKeys.ITEM, Identifier.of("wooden_slabs"));
- TagKey
- wooden_vertical_slabs = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "wooden_vertical_slabs"));
+ TagKey
- wooden_vertical_slabs = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("wooden_vertical_slabs"));
TagKey
- wooden_fences = TagKey.of(RegistryKeys.ITEM, Identifier.of( "wooden_fences"));
TagKey
- logs_that_burn = TagKey.of(RegistryKeys.ITEM, Identifier.of("logs_that_burn"));
TagKey
- stone_crafting_materials = TagKey.of(RegistryKeys.ITEM, Identifier.of("stone_crafting_materials"));
TagKey
- stone_tool_materials = TagKey.of(RegistryKeys.ITEM, Identifier.of("stone_tool_materials"));
TagKey
- leaves = TagKey.of(RegistryKeys.ITEM, Identifier.of("leaves"));
- TagKey
- ingot_shaping = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "ingot_shaping"));
- TagKey
- nugget_shaping = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "nugget_shaping"));
+ TagKey
- ingot_shaping = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("ingot_shaping"));
+ TagKey
- nugget_shaping = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("nugget_shaping"));
- TagKey
- tin_ores = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "tin_ores"));
- TagKey
- lead_ores = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "lead_ores"));
- TagKey
- silver_ores = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "silver_ores"));
- TagKey
- mithril_ores = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "mithril_ores"));
- TagKey
- shingles = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "shingles"));
+ TagKey
- tin_ores = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("tin_ores"));
+ TagKey
- lead_ores = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("lead_ores"));
+ TagKey
- silver_ores = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("silver_ores"));
+ TagKey
- mithril_ores = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("mithril_ores"));
+ TagKey
- shingles = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("shingles"));
TagKey
- mod_stripped_logs = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("mod_stripped_logs"));
TagKey
- stripped_logs = TagKey.of(RegistryKeys.ITEM, Identifier.of("c", "stripped_logs"));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/enchantments/EnchantmentsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/enchantments/EnchantmentsME.java
index 72e23421e7..0c1f9db6cc 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/enchantments/EnchantmentsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/enchantments/EnchantmentsME.java
@@ -173,6 +173,6 @@ private static void register(Registerable registry, RegistryKey getBoatFactory(Supplier> keyOf(String id) {
- return RegistryKey.of(RegistryKeys.ENTITY_TYPE, Identifier.of(MiddleEarth.MOD_ID, id));
+ return RegistryKey.of(RegistryKeys.ENTITY_TYPE, MiddleEarth.id(id));
}
private static EntityType register(String id, EntityType.Builder type) {
@@ -110,7 +110,7 @@ private static EntityType register(String id, EntityType.B
public static void registerModEntities() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Entities for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Entities");
FabricDefaultAttributeRegistry.register(STONE_TROLL, StoneTrollEntity.setAttributes());
FabricDefaultAttributeRegistry.register(PETRIFIED_TROLL, PetrifiedTrollEntity.setAttributes());
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityAttributesME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityAttributesME.java
index c9d82bf969..93c5484f8a 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityAttributesME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityAttributesME.java
@@ -22,7 +22,7 @@ private static RegistryEntry register(String name, double defau
}
public static void register() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod attributes");
+ MiddleEarth.logRegistryMsg("Attributes");
}
static {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityModelLayersME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityModelLayersME.java
index dbfedd86d1..c7d5164751 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityModelLayersME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityModelLayersME.java
@@ -96,7 +96,7 @@ public final class EntityModelLayersME {
* The modelData is used to know the UV map to use for the 3D model
* **/
private static EntityModelLayer registerEntityModelLayer(String registryName, TexturedModelData modelData) {
- EntityModelLayer entityModelLayer = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, registryName), MAIN);
+ EntityModelLayer entityModelLayer = new EntityModelLayer(MiddleEarth.id(registryName), MAIN);
EntityModelLayerRegistry.registerModelLayer(entityModelLayer, () -> modelData);
return entityModelLayer;
}
@@ -105,7 +105,7 @@ private static EntityModelLayer registerEntityModelLayer(String registryName, Te
* The modelData is used to know the UV map to use for the 3D model
* **/
private static EntityModelLayer registerEntityModelLayer(String id, String layer, TexturedModelData modelData) {
- EntityModelLayer entityModelLayer = new EntityModelLayer(Identifier.of(MiddleEarth.MOD_ID, id), layer);
+ EntityModelLayer entityModelLayer = new EntityModelLayer(MiddleEarth.id(id), layer);
EntityModelLayerRegistry.registerModelLayer(entityModelLayer, () -> modelData);
return entityModelLayer;
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityTypeTagsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityTypeTagsME.java
index 7d54a46abe..b79827c2e6 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityTypeTagsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/EntityTypeTagsME.java
@@ -10,6 +10,6 @@ public class EntityTypeTagsME {
public static TagKey> UNGOLIENI = of("ungolieni");
private static TagKey> of(String id) {
- return TagKey.of(RegistryKeys.ENTITY_TYPE, Identifier.of(MiddleEarth.MOD_ID, id));
+ return TagKey.of(RegistryKeys.ENTITY_TYPE, MiddleEarth.id(id));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/TrackedDataHandlerRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/TrackedDataHandlerRegistryME.java
index 59a9af3579..f7782cd7b3 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/TrackedDataHandlerRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/TrackedDataHandlerRegistryME.java
@@ -41,7 +41,7 @@ public static void register() {
}
private static void of(String name, TrackedDataHandler dataHandler) {
- FabricTrackedDataRegistry.register(Identifier.of(MiddleEarth.MOD_ID, name), dataHandler);
+ FabricTrackedDataRegistry.register(MiddleEarth.id(name), dataHandler);
}
static {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/ActivitiesME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/ActivitiesME.java
index f058963448..04f475e831 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/ActivitiesME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/ActivitiesME.java
@@ -14,6 +14,6 @@ private static Activity register(String id) {
}
public static void registerModActivities() {
- MiddleEarth.LOGGER.logDebugMsg("Registering ModActivities for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Activities");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/MemoryModulesME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/MemoryModulesME.java
index f71a3a20a4..398965f969 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/MemoryModulesME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/MemoryModulesME.java
@@ -33,14 +33,14 @@ public Optional>> getCodec() {
}
private static MemoryModuleType register(String id, Codec codec) {
- return Registry.register(Registries.MEMORY_MODULE_TYPE, Identifier.of(MiddleEarth.MOD_ID, id), new MemoryModuleType<>(Optional.of(codec)));
+ return Registry.register(Registries.MEMORY_MODULE_TYPE, MiddleEarth.id(id), new MemoryModuleType<>(Optional.of(codec)));
}
private static MemoryModuleType register(String id) {
- return Registry.register(Registries.MEMORY_MODULE_TYPE, Identifier.of(MiddleEarth.MOD_ID, id), new MemoryModuleType<>(Optional.empty()));
+ return Registry.register(Registries.MEMORY_MODULE_TYPE, MiddleEarth.id(id), new MemoryModuleType<>(Optional.empty()));
}
public static void registerModMemoryModules() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Sensors for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Memory Modules");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/SensorsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/SensorsME.java
index 04dddf3523..19fb25f8a6 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/SensorsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/SensorsME.java
@@ -16,10 +16,10 @@ public class SensorsME {
public static final SensorType NPC_ATTACKABLES = register("npc_attackables", NpcAttackablesSensor::new);
private static > SensorType register(String id, Supplier factory) {
- return Registry.register(Registries.SENSOR_TYPE, Identifier.of(MiddleEarth.MOD_ID, id), new SensorType<>(factory));
+ return Registry.register(Registries.SENSOR_TYPE, MiddleEarth.id(id), new SensorType<>(factory));
}
public static void registerModSensors() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Sensors for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Sensors");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/task/CaveTrollEatFoodTask.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/task/CaveTrollEatFoodTask.java
index 3f6ca76c5c..f4c40d89df 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/task/CaveTrollEatFoodTask.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/ai/brain/task/CaveTrollEatFoodTask.java
@@ -21,7 +21,7 @@
public class CaveTrollEatFoodTask extends MultiTickTask {
private long startTime;
- public static TagKey
- TROLL_FOOD = TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "troll_food"));
+ public static TagKey
- TROLL_FOOD = TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("troll_food"));
public CaveTrollEatFoodTask() {
super(
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/barrel/BarrelEntityRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/barrel/BarrelEntityRenderer.java
index 1db01b525b..6412c248f5 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/barrel/BarrelEntityRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/barrel/BarrelEntityRenderer.java
@@ -17,7 +17,7 @@
import org.joml.Quaternionf;
public class BarrelEntityRenderer extends EntityRenderer {
- private static final Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID, "textures/entities/reinforced_barrel/reinforced_barrel.png");
+ private static final Identifier TEXTURE = MiddleEarth.id("textures/entities/reinforced_barrel/reinforced_barrel.png");
private ModelPart modelPart;
private final Model waterMaskModel;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/broadhoof/features/BroadhoofGoatSaddleFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/broadhoof/features/BroadhoofGoatSaddleFeatureRenderer.java
index 9a0d5ad22a..b4e0401950 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/broadhoof/features/BroadhoofGoatSaddleFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/broadhoof/features/BroadhoofGoatSaddleFeatureRenderer.java
@@ -30,7 +30,7 @@ public BroadhoofGoatSaddleFeatureRenderer(FeatureRendererContext entityType, Wor
if(scavengeLootTable == null && !world.isClient()) {
if(world instanceof ServerWorld serverWorld) {
- LootTable lootTable = serverWorld.getServer().getReloadableRegistries().getLootTable(RegistryKey.of(RegistryKeys.LOOT_TABLE, Identifier.of(MiddleEarth.MOD_ID, "gameplay/cave_troll_scavenging")));
+ LootTable lootTable = serverWorld.getServer().getReloadableRegistries().getLootTable(RegistryKey.of(RegistryKeys.LOOT_TABLE, MiddleEarth.id("gameplay/cave_troll_scavenging")));
if(lootTable != null) {
scavengeLootTable = lootTable;
@@ -244,7 +244,7 @@ public boolean usesTameness() {
}
public boolean isTrollWeapon(ItemStack itemStack) {
- return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "troll_weapons")));
+ return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("troll_weapons")));
}
@Override
@@ -691,17 +691,17 @@ public List getCompatibleRaces() {
@Override
public boolean isCommandItem(ItemStack stack) {
- return stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")));
+ return stack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")));
}
@Override
public boolean isFoodItem(ItemStack itemStack) {
- return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "troll_food")));
+ return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("troll_food")));
}
@Override
public boolean isBondingItem(ItemStack itemStack) {
- return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "chains")));
+ return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("chains")));
}
public static boolean shouldTarget(LivingEntity target) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollDroolFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollDroolFeatureRenderer.java
index 6d4f61ef8f..64e2f19166 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollDroolFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollDroolFeatureRenderer.java
@@ -14,7 +14,7 @@
import net.sevenstars.middleearth.entity.beasts.cave_troll.CaveTrollEntityRenderState;
public class CaveTrollDroolFeatureRenderer extends FeatureRenderer {
- private static final Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID, "textures/entities/trolls/cave/cave_troll_green_drooling.png");
+ private static final Identifier TEXTURE = MiddleEarth.id("textures/entities/trolls/cave/cave_troll_green_drooling.png");
public CaveTrollDroolFeatureRenderer(FeatureRendererContext featureRendererContext) {
super(featureRendererContext);
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollSaddleFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollSaddleFeatureRenderer.java
index 0e826f87d3..5f98487092 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollSaddleFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/cave_troll/feature/CaveTrollSaddleFeatureRenderer.java
@@ -30,7 +30,7 @@ public CaveTrollSaddleFeatureRenderer(FeatureRendererContext LOCATION_BY_VARIANT =
Util.make(Maps.newEnumMap(GreatHornVariantDep.class), (map) -> {
map.put(GreatHornVariantDep.BROWN,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "brown_great_horn.png"));
+ MiddleEarth.id(PATH + "brown_great_horn.png"));
map.put(GreatHornVariantDep.TEMPERATE,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "temperate_great_horn.png"));
+ MiddleEarth.id(PATH + "temperate_great_horn.png"));
map.put(GreatHornVariantDep.COLD,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "cold_great_horn.png"));
+ MiddleEarth.id(PATH + "cold_great_horn.png"));
map.put(GreatHornVariantDep.WARM,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warm_great_horn.png"));
+ MiddleEarth.id(PATH + "warm_great_horn.png"));
map.put(GreatHornVariantDep.WHITE,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "white_great_horn.png"));
+ MiddleEarth.id(PATH + "white_great_horn.png"));
});
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornArmorFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornArmorFeatureRenderer.java
index 5cf72025a8..35d77d0ae1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornArmorFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornArmorFeatureRenderer.java
@@ -45,14 +45,14 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
dyeable = true;
}
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers,
- RenderLayer.getArmorCutoutNoCull(Identifier.of(MiddleEarth.MOD_ID, path)), itemStack.hasGlint());
+ RenderLayer.getArmorCutoutNoCull(MiddleEarth.id(path)), itemStack.hasGlint());
if(dyeable){
int color = DyedColorComponent.getColor(itemStack, DyedColorComponent.DEFAULT_COLOR);
model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV, color);
if(DyeablePiecesME.dyeablePieces.get(itemStack.getItem())) {
ArmorRenderer.renderPart(matrices, vertexConsumers, light, itemStack, model,
- Identifier.of(MiddleEarth.MOD_ID, path.replaceAll(".png", "_overlay.png")));
+ MiddleEarth.id(path.replaceAll(".png", "_overlay.png")));
}
} else {
model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornNoseFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornNoseFeatureRenderer.java
index c04a6b61f3..1ddf0acfd2 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornNoseFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornNoseFeatureRenderer.java
@@ -22,7 +22,7 @@
@Environment(EnvType.CLIENT)
public class GreatHornNoseFeatureRenderer extends FeatureRenderer {
private final GreatHornModel model;
- private final static Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID, "textures/entities/great_horn/feature/great_horn_red_nose.png");
+ private final static Identifier TEXTURE = MiddleEarth.id("textures/entities/great_horn/feature/great_horn_red_nose.png");
public GreatHornNoseFeatureRenderer(FeatureRendererContext context, LoadedEntityModels loader) {
super(context);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornSaddleFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornSaddleFeatureRenderer.java
index 92bdef4e73..f8633f1333 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornSaddleFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/great_horn/features/GreatHornSaddleFeatureRenderer.java
@@ -34,7 +34,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
if(blueSaddle) suffix = "_blue";
if(!itemStack.isEmpty()) {
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers,
- RenderLayer.getArmorCutoutNoCull(Identifier.of(MiddleEarth.MOD_ID, PATH + suffix + ".png")), itemStack.hasGlint());
+ RenderLayer.getArmorCutoutNoCull(MiddleEarth.id(PATH + suffix + ".png")), itemStack.hasGlint());
model.setAngles(state);
model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/TrollEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/TrollEntity.java
index 6a714508de..def9a27ccf 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/TrollEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/TrollEntity.java
@@ -180,7 +180,7 @@ protected float getSaddledSpeed(PlayerEntity controllingPlayer) {
}
public boolean isCommandItem(ItemStack stack) {
- return stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")));
+ return stack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")));
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/petrified/PetrifiedTrollRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/petrified/PetrifiedTrollRenderer.java
index 9e97907f36..b786d9907b 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/petrified/PetrifiedTrollRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/petrified/PetrifiedTrollRenderer.java
@@ -22,6 +22,6 @@ public LivingEntityRenderState createRenderState() {
@Override
public Identifier getTexture(LivingEntityRenderState state) {
- return Identifier.of(MiddleEarth.MOD_ID, PATH + "petrified_stone_troll.png");
+ return MiddleEarth.id(PATH + "petrified_stone_troll.png");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/snow/SnowTrollRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/snow/SnowTrollRenderer.java
index 21e01cc39a..ff386c9b71 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/snow/SnowTrollRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/snow/SnowTrollRenderer.java
@@ -20,6 +20,6 @@ public TrollEntityRenderState createRenderState() {
}
@Override
public Identifier getTexture(TrollEntityRenderState state) {
- return Identifier.of(MiddleEarth.MOD_ID, PATH);
+ return MiddleEarth.id(PATH);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollEntity.java
index 96988c2b41..493fbc318e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollEntity.java
@@ -114,7 +114,7 @@ public boolean isBondingItem(ItemStack itemStack) {
@Override
protected boolean isAffectedByDaylight() {
if (this.getWorld().isDay() && !this.getWorld().isClient()) {
- if(this.getWorld().getBiome(getBlockPos()).isIn(TagKey.of(RegistryKeys.BIOME, Identifier.of(MiddleEarth.MOD_ID, "is_biome_in_darkness")))){
+ if(this.getWorld().getBiome(getBlockPos()).isIn(TagKey.of(RegistryKeys.BIOME, MiddleEarth.id("is_biome_in_darkness")))){
return false;
}
float f = this.getWorld().getBlockState(getBlockPos()).getAmbientOcclusionLightLevel(getWorld(), getBlockPos());
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollRenderer.java
index 6792925b5c..5c691dc7c4 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/trolls/stone/StoneTrollRenderer.java
@@ -20,6 +20,6 @@ public TrollEntityRenderState createRenderState() {
}
@Override
public Identifier getTexture(TrollEntityRenderState state) {
- return Identifier.of(MiddleEarth.MOD_ID, PATH);
+ return MiddleEarth.id(PATH);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargEntity.java
index cca0b0fb95..58215089e5 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargEntity.java
@@ -100,7 +100,7 @@ protected void initGoals() {
this.goalSelector.add(3, new MeleeAttackGoal(this, 2, false));
this.goalSelector.add(4, new ChargeAttackGoal(this, this.getDisposition(), maxChargeCooldown()));
this.goalSelector.add(5, new AnimalMateGoal(this, 1.5));
- this.goalSelector.add(6, new TemptGoal(this, 0.9, (stack) -> stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "warg_food"))), false));
+ this.goalSelector.add(6, new TemptGoal(this, 0.9, (stack) -> stack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("warg_food"))), false));
this.goalSelector.add(7, new WanderAroundFarGoal(this, 0.5));
this.goalSelector.add(8, new LookAtEntityGoal(this, PlayerEntity.class, 6.0f));
this.goalSelector.add(9, new LookAroundGoal(this));
@@ -248,7 +248,7 @@ public boolean canBreedWith(AnimalEntity other) {
@Override
public boolean isBreedingItem(ItemStack stack) {
- return stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "warg_food")));
+ return stack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("warg_food")));
}
@Override
@@ -349,7 +349,7 @@ else if(this.startSittingAnimationState.isRunning() || this.sittingAnimationStat
}
@Override
public boolean isCommandItem(ItemStack stack) {
- return stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "bones")));
+ return stack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("bones")));
}
@Override
@@ -438,7 +438,7 @@ public boolean handleFallDamage(double fallDistance, float damagePerDistance, Da
//@Override
public boolean isHorseArmor(ItemStack stack) {
- return stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "warg_armor")));
+ return stack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("warg_armor")));
}
public boolean hasCharged() {
@@ -451,7 +451,7 @@ public void setHasCharged(boolean hasCharged) {
@Override
public boolean isBondingItem(ItemStack itemStack) {
- return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "warg_food")));
+ return itemStack.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("warg_food")));
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargRenderer.java
index 57f0991180..d9929d8f1b 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/WargRenderer.java
@@ -60,19 +60,19 @@ public WargEntityRenderState createRenderState() {
public static final Map LOCATION_BY_VARIANT =
Util.make(Maps.newEnumMap(WargVariant.class), (map) -> {
map.put(WargVariant.BROWN,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_brown.png"));
+ MiddleEarth.id(PATH + "warg_brown.png"));
map.put(WargVariant.BLACK,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_black.png"));
+ MiddleEarth.id(PATH + "warg_black.png"));
map.put(WargVariant.GRAY,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_gray.png"));
+ MiddleEarth.id(PATH + "warg_gray.png"));
map.put(WargVariant.LIGHT_GRAY,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_light_gray.png"));
+ MiddleEarth.id(PATH + "warg_light_gray.png"));
map.put(WargVariant.SNOW,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_snow.png"));
+ MiddleEarth.id(PATH + "warg_snow.png"));
map.put(WargVariant.MOTTLED,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_mottled.png"));
+ MiddleEarth.id(PATH + "warg_mottled.png"));
map.put(WargVariant.TAN,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_tan.png"));
+ MiddleEarth.id(PATH + "warg_tan.png"));
});
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorBackSkullFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorBackSkullFeatureRenderer.java
index 9df1a6d67b..2b3ae5189e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorBackSkullFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorBackSkullFeatureRenderer.java
@@ -35,7 +35,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
MountArmorAddonComponent component = itemStack.get(DataComponentTypesME.MOUNT_ARMOR_DATA);
if(component != null && component.topArmorAddon() && itemStack.isOf(EquipmentItemsME.WARG_GUNDABAD_PLATE_ARMOR)) {
- VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(Identifier.of(MiddleEarth.MOD_ID, "textures/entities/warg/feature/warg_armor_addons.png")), itemStack.hasGlint());
+ VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(MiddleEarth.id("textures/entities/warg/feature/warg_armor_addons.png")), itemStack.hasGlint());
model.setAngles(state);
model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorFrontSkullFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorFrontSkullFeatureRenderer.java
index f8af17e08d..4462cde33c 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorFrontSkullFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorFrontSkullFeatureRenderer.java
@@ -35,7 +35,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
MountArmorAddonComponent component = itemStack.get(DataComponentTypesME.MOUNT_ARMOR_DATA);
if(component != null && component.topArmorAddon() && itemStack.isOf(EquipmentItemsME.WARG_MORDOR_PLATE_ARMOR)) {
- VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(Identifier.of(MiddleEarth.MOD_ID, "textures/entities/warg/feature/warg_armor_addons.png")), itemStack.hasGlint());
+ VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(MiddleEarth.id("textures/entities/warg/feature/warg_armor_addons.png")), itemStack.hasGlint());
model.setAngles(state);
model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSideSkullsFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSideSkullsFeatureRenderer.java
index 40be6815fd..884d70a431 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSideSkullsFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSideSkullsFeatureRenderer.java
@@ -34,7 +34,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
MountArmorAddonComponent component = itemStack.get(DataComponentTypesME.MOUNT_ARMOR_DATA);
if(component != null && component.sideArmorAddon()) {
- VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(Identifier.of(MiddleEarth.MOD_ID, "textures/entities/warg/feature/warg_armor_side_skull_addon.png")), itemStack.hasGlint());
+ VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(MiddleEarth.id("textures/entities/warg/feature/warg_armor_side_skull_addon.png")), itemStack.hasGlint());
model.setAngles(state);
model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSpineFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSpineFeatureRenderer.java
index bb64e49eb9..28222393b9 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSpineFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargArmorSpineFeatureRenderer.java
@@ -30,13 +30,13 @@ public WargArmorSpineFeatureRenderer(FeatureRendererContext {
private static final String PATH = "textures/entities/warg/eyes/";
- private static final Identifier EMISSIVE_TEXTURE = Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_eyes_emissive.png");
+ private static final Identifier EMISSIVE_TEXTURE = MiddleEarth.id(PATH + "warg_eyes_emissive.png");
private static final Map LOCATION_BY_VARIANT =
Util.make(Maps.newEnumMap(WargEyeVariant.class), (map) -> {
map.put(WargEyeVariant.BLUE,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_eyes_blue.png"));
+ MiddleEarth.id(PATH + "warg_eyes_blue.png"));
map.put(WargEyeVariant.ORANGE,
- Identifier.of(MiddleEarth.MOD_ID, PATH + "warg_eyes_orange.png"));
+ MiddleEarth.id(PATH + "warg_eyes_orange.png"));
});
public WargEyesFeatureRenderer(FeatureRendererContext featureRendererContext) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargSaddleFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargSaddleFeatureRenderer.java
index ffa5688756..39ac61c65b 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargSaddleFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/beasts/warg/features/WargSaddleFeatureRenderer.java
@@ -30,7 +30,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
ItemStack itemStack = state.saddle;
boolean hasArmor = !state.armor.isEmpty();
if(!itemStack.isEmpty()) {
- VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(Identifier.of(MiddleEarth.MOD_ID, "textures/entities/warg/feature/warg_saddle.png")), itemStack.hasGlint());
+ VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(MiddleEarth.id("textures/entities/warg/feature/warg_saddle.png")), itemStack.hasGlint());
model.setAngles(state);
model.renderSaddle(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/NpcEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/NpcEntity.java
index f732ae9dd5..d8757a31ee 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/NpcEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/NpcEntity.java
@@ -44,6 +44,7 @@
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.random.Random;
import net.minecraft.world.*;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.special.structureManager.StructureManagerBlockEntity;
import net.sevenstars.middleearth.entity.EntityAttributesME;
@@ -689,7 +690,9 @@ public void tickRiding() {
@Override
protected Text getDefaultName() {
if(this.getNpcTypeIdentifier() == null) {
- return Text.translatable("npc_type."+ MiddleEarth.MOD_ID +".npc");
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.NPC_TYPE, "npc")
+ );
}
return Text.translatable(this.getNpcTypeIdentifier().toTranslationKey("npc_type"));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/renderer/features/hair/HairFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/renderer/features/hair/HairFeatureRenderer.java
index 5bb65df399..430f8d0932 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/renderer/features/hair/HairFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/npcs/renderer/features/hair/HairFeatureRenderer.java
@@ -45,7 +45,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
// TODO : Disable the beard based on the helmet
/*
- if (entity.getEquippedStack(EquipmentSlot.HEAD).isIn(TagK°.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "helmet_hides_dwarf_beard")))){
+ if (entity.getEquippedStack(EquipmentSlot.HEAD).isIn(TagK°.of(RegistryKeys.ITEM, MiddleEarth.id("helmet_hides_dwarf_beard")))){
*/
if(hairAddonTextureId == null && beardAddonTextureId == null){
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/projectile/smoke/SmokeRingProjectileRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/projectile/smoke/SmokeRingProjectileRenderer.java
index 168e02a76e..7f5934442f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/projectile/smoke/SmokeRingProjectileRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/projectile/smoke/SmokeRingProjectileRenderer.java
@@ -21,7 +21,7 @@
public class SmokeRingProjectileRenderer extends EntityRenderer {
private final Sprite[] frames;
- private static final Identifier SPRITES_ATLAS_ID = Identifier.of(MiddleEarth.MOD_ID, "sprites");
+ private static final Identifier SPRITES_ATLAS_ID = MiddleEarth.id("sprites");
private static final String SPRITE_PATH_PREFIX = "sprites/smoke_ring/big_smoke_ring_";
private static final int FRAME_COUNT = 12;
private static final int FAILED_FIRST_FRAME = 7;
@@ -91,7 +91,7 @@ private Sprite[] loadFrames() {
Sprite[] sprites = new Sprite[FRAME_COUNT];
for (int i = 0; i < FRAME_COUNT; i++) {
- Identifier spriteId = Identifier.of(MiddleEarth.MOD_ID, SPRITE_PATH_PREFIX + i);
+ Identifier spriteId = MiddleEarth.id(SPRITE_PATH_PREFIX + i);
sprites[i] = atlas.getSprite(spriteId);
}
return sprites;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/seat/SeatEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/seat/SeatEntity.java
index aba5fd5b3e..765138551f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/seat/SeatEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/seat/SeatEntity.java
@@ -31,10 +31,10 @@ public void tick() {
if(!this.getWorld().isClient){
World world = this.getWorld();
BlockPos pos = this.getBlockPos();
- if (!this.hasPassengers() && this.getWorld().getBlockState(pos).isIn(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "seat")))){
+ if (!this.hasPassengers() && this.getWorld().getBlockState(pos).isIn(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("seat")))){
world.setBlockState(this.getBlockPos(), world.getBlockState(pos).with(SeatBlock.OCCUPIED, false));
this.remove(RemovalReason.DISCARDED);
- } else if(!this.hasPassengers() || !this.getWorld().getBlockState(pos).isIn(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "seat")))){
+ } else if(!this.hasPassengers() || !this.getWorld().getBlockState(pos).isIn(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("seat")))){
this.remove(RemovalReason.DISCARDED);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/EnwebbedFeatureRenderer.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/EnwebbedFeatureRenderer.java
index 646f5753b0..8079659d2c 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/EnwebbedFeatureRenderer.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/EnwebbedFeatureRenderer.java
@@ -19,7 +19,7 @@
@Environment(EnvType.CLIENT)
public class EnwebbedFeatureRenderer
> extends FeatureRenderer {
- private static final Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID, "textures/entities/spiders/enwebbed.png");
+ private static final Identifier TEXTURE = MiddleEarth.id("textures/entities/spiders/enwebbed.png");
private final EnwebbedModel model;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/larva/ShelobiteLarvaEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/larva/ShelobiteLarvaEntity.java
index c4b841143d..52378cf668 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/larva/ShelobiteLarvaEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/larva/ShelobiteLarvaEntity.java
@@ -192,7 +192,7 @@ public boolean isClimbing() {
}
public void slowMovement(BlockState state, Vec3d multiplier) {
- if (!state.isIn(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "cobwebs")))) {
+ if (!state.isIn(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("cobwebs")))) {
super.slowMovement(state, multiplier);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/scuttler/ShelobiteScuttlerEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/scuttler/ShelobiteScuttlerEntity.java
index 9ea1ca495c..f8d648a576 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/scuttler/ShelobiteScuttlerEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/scuttler/ShelobiteScuttlerEntity.java
@@ -323,7 +323,7 @@ public boolean isClimbing() {
}
public void slowMovement(BlockState state, Vec3d multiplier) {
- if (!state.isIn(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "cobwebs")))) {
+ if (!state.isIn(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("cobwebs")))) {
super.slowMovement(state, multiplier);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/spawn/SpawnOfShelobEntity.java b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/spawn/SpawnOfShelobEntity.java
index ddc9410d8b..d9155a5296 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/spawn/SpawnOfShelobEntity.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/entity/spider/spawn/SpawnOfShelobEntity.java
@@ -325,7 +325,7 @@ public boolean isClimbing() {
}
public void slowMovement(BlockState state, Vec3d multiplier) {
- if (!state.isIn(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "cobwebs")))) {
+ if (!state.isIn(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("cobwebs")))) {
super.slowMovement(state, multiplier);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/event/EventRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/event/EventRegistryME.java
index c99722711c..b2575dabd3 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/event/EventRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/event/EventRegistryME.java
@@ -34,7 +34,7 @@
import java.util.Objects;
public class EventRegistryME {
- private static final String GOT_STARTER_ITEM = MiddleEarth.MOD_ID + ".received_starter_item";
+ private static final String GOT_STARTER_ITEM = MiddleEarth.getModId() + ".received_starter_item"; // FIXME: might be a better way
public static void register(){
ServerPlayConnectionEvents.JOIN.register((serverPlayNetworkHandler, packetSender, minecraftServer) -> {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/event/KeyInputHandler.java b/middle-earth/src/main/java/net/sevenstars/middleearth/event/KeyInputHandler.java
index ffe40222b5..6a8cdf1362 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/event/KeyInputHandler.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/event/KeyInputHandler.java
@@ -3,6 +3,7 @@
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.network.packets.client2server.HoodStateTogglePacket;
import net.minecraft.client.option.KeyBinding;
@@ -11,10 +12,10 @@
public class KeyInputHandler {
- public static final String ME_KEY_CATEGORY = "key.category.%s.%s".formatted(MiddleEarth.MOD_ID, MiddleEarth.MOD_ID);
- public static final String ME_KEY_HOOD_STATE_TOGGLE = "key.%s.hood_state_toggle".formatted(MiddleEarth.MOD_ID);
- public static final String ME_KEY_MAP_TELEPORT = "key.%s.map_teleport".formatted(MiddleEarth.MOD_ID);
- public static final String ME_KEY_MAP_FULLSCREEN_TOGGLE = "key.%s.map_fullscreen_toggle".formatted(MiddleEarth.MOD_ID);
+ public static final String ME_KEY_CATEGORY = MiddleEarth.rawTranslationKeyWithModId(LangCategory.KEY.Prefix + ".category", "");
+ public static final String ME_KEY_HOOD_STATE_TOGGLE = MiddleEarth.rawTranslationKeyWithModId(LangCategory.KEY, "hood_state_toggle");
+ public static final String ME_KEY_MAP_TELEPORT = MiddleEarth.rawTranslationKeyWithModId(LangCategory.KEY, "map_teleport");
+ public static final String ME_KEY_MAP_FULLSCREEN_TOGGLE = MiddleEarth.rawTranslationKeyWithModId(LangCategory.KEY, "map_fullscreen_toggle");
public static KeyBinding hoodStateToggleKey;
// Used in MapScreen
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/FactionIdentifierException.java b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/FactionIdentifierException.java
index 2003a554d2..d14b09f183 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/FactionIdentifierException.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/FactionIdentifierException.java
@@ -1,8 +1,9 @@
package net.sevenstars.middleearth.exceptions;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
public class FactionIdentifierException extends Exception{
- public static final String KEY = "exception.%s.faction_identifier".formatted(MiddleEarth.MOD_ID);
+ public static final String KEY = MiddleEarth.rawTranslationKeyWithModId(LangCategory.EXCEPTION, "faction_identifier");
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/IdenticalFactionException.java b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/IdenticalFactionException.java
index 6ac8d75c45..0b883c5350 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/IdenticalFactionException.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/IdenticalFactionException.java
@@ -1,9 +1,10 @@
package net.sevenstars.middleearth.exceptions;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
public class IdenticalFactionException extends Exception{
- public static final String KEY_TARGET = "exception.%s.identical_faction.target".formatted(MiddleEarth.MOD_ID);
- public static final String KEY_SOURCE = "exception.%s.identical_faction.source".formatted(MiddleEarth.MOD_ID);
+ public static final String KEY_TARGET = MiddleEarth.rawTranslationKeyWithModId(LangCategory.EXCEPTION, "identical_faction.target");
+ public static final String KEY_SOURCE = MiddleEarth.rawTranslationKeyWithModId(LangCategory.EXCEPTION, "identical_faction.source");
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/NoFactionException.java b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/NoFactionException.java
index 7488856365..74e5194b65 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/NoFactionException.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/NoFactionException.java
@@ -1,9 +1,10 @@
package net.sevenstars.middleearth.exceptions;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
public class NoFactionException extends Exception{
- public static final String KEY_TARGET = "exception.%s.no_faction.target".formatted(MiddleEarth.MOD_ID);
- public static final String KEY_SOURCE = "exception.%s.no_faction.source".formatted(MiddleEarth.MOD_ID);
+ public static final String KEY_TARGET = MiddleEarth.rawTranslationKeyWithModId(LangCategory.EXCEPTION, "no_faction.target");
+ public static final String KEY_SOURCE = MiddleEarth.rawTranslationKeyWithModId(LangCategory.EXCEPTION, "no_faction.source");
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/SpawnIdentifierException.java b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/SpawnIdentifierException.java
index 7b2937faa9..a2011f95eb 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/SpawnIdentifierException.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/exceptions/SpawnIdentifierException.java
@@ -1,8 +1,9 @@
package net.sevenstars.middleearth.exceptions;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
public class SpawnIdentifierException extends Exception{
- public static final String KEY = "exception.%s.spawn_identifier".formatted(MiddleEarth.MOD_ID);
+ public static final String KEY = MiddleEarth.rawTranslationKeyWithModId(LangCategory.EXCEPTION, "spawn_identifier");
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/ScreenHandlerRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/ScreenHandlerRegistryME.java
index cbb3468f3b..6d3f4b619f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/ScreenHandlerRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/ScreenHandlerRegistryME.java
@@ -58,6 +58,6 @@ public static void registerAllScreenHandlers() {
}
private static void register(String name, ScreenHandlerType handlerType) {
- Registry.register(Registries.SCREEN_HANDLER, Identifier.of(MiddleEarth.MOD_ID, name), handlerType);
+ Registry.register(Registries.SCREEN_HANDLER, MiddleEarth.id(name), handlerType);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableInputsShape.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableInputsShape.java
index 62a3cc3430..c2baaf2652 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableInputsShape.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableInputsShape.java
@@ -150,6 +150,6 @@ public static ArtisanTableInputsShape getShape(String id) {
}
public void register() {
- MiddleEarth.LOGGER.logDebugMsg("Registering ArtisanTable Inputs Shapes for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("ArtisanTable Inputs Shapes");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableScreen.java
index 139cf0a8f6..5da50326e1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/artisantable/ArtisanTableScreen.java
@@ -7,6 +7,7 @@
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.EquippableComponent;
import net.minecraft.inventory.CraftingResultInventory;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.item.EquipmentItemsME;
import net.sevenstars.middleearth.item.ToolItemsME;
@@ -39,7 +40,7 @@
@Environment(value= EnvType.CLIENT)
public class ArtisanTableScreen extends HandledScreen implements ScreenHandlerListener {
- private static final Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID, "textures/gui/artisan_table.png");
+ private static final Identifier TEXTURE = MiddleEarth.id("textures/gui/artisan_table.png");
public static final int SLOT_SCALE = 18;
public static final int SLOT_OFFSET_X = 12;
public static final int SLOT_OFFSET_Y = 15;
@@ -382,6 +383,8 @@ private void changeTab() {
}
private static Text getTabTranslation(String tab) {
- return Text.translatable("screen." + MiddleEarth.MOD_ID + ".artisan_table." + tab);
+ return Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "artisan_table." + tab)
+ );
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/forge/ForgeAlloyingScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/forge/ForgeAlloyingScreen.java
index c12b7efae0..c4a0131f94 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/forge/ForgeAlloyingScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/forge/ForgeAlloyingScreen.java
@@ -12,6 +12,7 @@
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.special.forge.MetalTypes;
import net.sevenstars.middleearth.network.packets.client2server.ForgeModeSwitchPacket;
@@ -92,11 +93,15 @@ protected void init() {
}
ClientPlayNetworking.send(new ForgeOutputPacket(amount, handler.getPos().getX(),handler.getPos().getY(),handler.getPos().getZ(), outputMode));
- }, Text.translatable("button." + MiddleEarth.MOD_ID + ".extract_metal")
+ }, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.BUTTON, "extract_metal")
+ )
);
if(this.outputMode == 0 && handler.checkMaxOutput() > 0) {
- this.extractButton.setTooltip(Tooltip.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".forge_output_mode_await")));
+ this.extractButton.setTooltip(Tooltip.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "forge_output_mode_await")
+ )));
} else {
setExtractButtonTooltip();
}
@@ -107,17 +112,25 @@ protected void init() {
this.modeSwitchToAlloyButton.active = false;
this.modeSwitchToHeatingButton.visible = true;
this.modeSwitchToHeatingButton.active = true;
- }, Text.translatable("button." + MiddleEarth.MOD_ID + ".switch_mode"));
+ }, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.BUTTON, "switch_mode")
+ ));
this.modeSwitchToHeatingButton = new TexturedButtonWidget(x + 23, y + 60, 10 ,10, ALLOYING_SWITCH_BUTTON_TEXTURES, (button)-> {
ClientPlayNetworking.send(new ForgeModeSwitchPacket(handler.getPos().getX(),handler.getPos().getY(),handler.getPos().getZ()));
this.modeSwitchToHeatingButton.visible = false;
this.modeSwitchToHeatingButton.active = false;
this.modeSwitchToAlloyButton.visible = true;
this.modeSwitchToAlloyButton.active = true;
- }, Text.translatable("button." + MiddleEarth.MOD_ID + ".switch_mode"));
+ }, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.BUTTON, "switch_mode")
+ ));
- this.modeSwitchToHeatingButton.setTooltip(Tooltip.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID +".forge_mode_switch_heating")));
- this.modeSwitchToAlloyButton.setTooltip(Tooltip.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID +".forge_mode_switch_alloying")));
+ this.modeSwitchToHeatingButton.setTooltip(Tooltip.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "forge_mode_switch_heating")
+ )));
+ this.modeSwitchToAlloyButton.setTooltip(Tooltip.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "forge_mode_switch_alloying")
+ )));
addDrawableChild(leftExtractCycleButton);
addDrawableChild(extractButton);
@@ -164,7 +177,9 @@ protected void handledScreenTick() {
}
if(this.outputMode == 0 && handler.checkMaxOutput() > 0) {
- this.extractButton.setTooltip(Tooltip.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".forge_output_mode_await")));
+ this.extractButton.setTooltip(Tooltip.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "forge_output_mode_await")
+ )));
} else {
setExtractButtonTooltip();
}
@@ -199,7 +214,9 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
protected void setExtractButtonTooltip() {
int id = outputMode;
if(outputMode == 4) id = 3;
- this.extractButton.setTooltip(Tooltip.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".forge_output_mode" + id)));
+ this.extractButton.setTooltip(Tooltip.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "forge_output_mode" + id)
+ )));
}
protected void updateSwitchState() {
@@ -262,9 +279,15 @@ private void renderLiquidStorageTooltip(DrawContext context, int mouseX, int mou
MetalTypes metal = MetalTypes.getValue(handler.getCurrentMetal());
if(metal != MetalTypes.EMPTY){
context.drawOrderedTooltip(this.client.textRenderer, Lists.transform(
- List.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID +".liquid_" + metal.asString().toLowerCase()).withColor(metal.getColor()),
- Text.literal(handler.getStoredLiquid() / 144 + " ").append(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".ingots_number")),
- Text.literal(handler.getStoredLiquid() % 144 / 16 + " ").append(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".nuggets_number"))
+ List.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "liquid_" + metal.asString().toLowerCase())
+ ).withColor(metal.getColor()),
+ Text.literal(handler.getStoredLiquid() / 144 + " ").append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "ingots_number")
+ )),
+ Text.literal(handler.getStoredLiquid() % 144 / 16 + " ").append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "nuggets_number")
+ ))
), Text::asOrderedText), mouseX, mouseY);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/inscriptiontable/InscriptionTableScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/inscriptiontable/InscriptionTableScreen.java
index 2294c7bb6f..7089cd76ac 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/inscriptiontable/InscriptionTableScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/inscriptiontable/InscriptionTableScreen.java
@@ -19,6 +19,7 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.network.packets.client2server.InscriptionConfirmationPacket;
import net.sevenstars.middleearth.network.packets.client2server.InscriptionWordUpdatePacket;
@@ -183,7 +184,9 @@ protected void drawBackground(DrawContext context, float delta, int mouseX, int
int color;
String levelKey = (k == 1) ? ".level" : ".levels";
- Text text = Text.translatable("inscription." + MiddleEarth.MOD_ID + levelKey, k);
+ Text text = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.INSCRIPTION, levelKey), k
+ );
if (this.client.player.isInCreativeMode() || (l >= k && k != 0)){
color = -8323296;
@@ -216,9 +219,13 @@ protected void drawBackground(DrawContext context, float delta, int mouseX, int
int m = 0;
for(String word : this.selectedWords){
if (m != 0){
- stringBuilder.append(Text.translatable("inscription." + MiddleEarth.MOD_ID + ".linking_dash").getString());
+ stringBuilder.append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.INSCRIPTION, "linking_dash")
+ ).getString());
}
- stringBuilder.append(Text.translatable("inscription." + MiddleEarth.MOD_ID + "." + word).getString());
+ stringBuilder.append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.INSCRIPTION, word)
+ ).getString());
m++;
}
StringVisitable stringVisitable = textRenderer.getTextHandler().trimToWidth(Text.literal(stringBuilder.toString()), 159, Style.EMPTY);
@@ -255,13 +262,19 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
WidgetInscriptionButtonPage widgetButtonPage = this.words[index - indexStartOffset];
if(widgetButtonPage.hidden) {
// Text text = Text.literal(StringUtils.capitalize(word)).setStyle(Style.EMPTY.withStrikethrough(widgetButtonPage.hidden));
- Text text = Text.translatable("inscription." + MiddleEarth.MOD_ID + "." + word).setStyle(Style.EMPTY.withStrikethrough(widgetButtonPage.hidden));
+ Text text = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.INSCRIPTION, word)
+ ).setStyle(Style.EMPTY.withStrikethrough(widgetButtonPage.hidden));
context.drawText(this.textRenderer, text, i + 11, n, Colors.LIGHT_GRAY, false);
} else {
- context.drawText(this.textRenderer, Text.translatable("inscription." + MiddleEarth.MOD_ID + "." + word), i + 11, n, Colors.WHITE, false);
+ context.drawText(this.textRenderer, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.INSCRIPTION, word)
+ ), i + 11, n, Colors.WHITE, false);
}
} else {
- context.drawText(this.textRenderer, Text.translatable("inscription." + MiddleEarth.MOD_ID + "." + word), i + 11, n, Colors.WHITE, false);
+ context.drawText(this.textRenderer, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.INSCRIPTION, word)
+ ), i + 11, n, Colors.WHITE, false);
}
n += 14;
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/map/MapScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/map/MapScreen.java
index e78383dd9c..8a54c02567 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/map/MapScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/map/MapScreen.java
@@ -10,6 +10,7 @@
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.config.ClientConfigME;
import net.sevenstars.middleearth.event.KeyInputHandler;
@@ -28,10 +29,12 @@
@Environment(EnvType.CLIENT)
public class MapScreen extends Screen {
- private static final Identifier BACKGROUND_TEXTURE = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/map_background.png");
- private static final Identifier MAP_UI_TEXTURE = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/map_ui.png");
+ private static final Identifier BACKGROUND_TEXTURE = MiddleEarth.id("textures/gui/map_background.png");
+ private static final Identifier MAP_UI_TEXTURE = MiddleEarth.id("textures/gui/map_ui.png");
- private static final Text MAP_TITLE_TEXT = Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.map_title_text");
+ private static final Text MAP_TITLE_TEXT = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.map_title_text")
+ );
private static final Vector2i NORMAL_BUTTON_SIZE = new Vector2i(15,15);
BackgroundContainerWidget backgroundContainerWidget;
@@ -67,14 +70,18 @@ protected void init() {
mapWidget = new FullscreenToggeableMapWidget(WIDTH - (MARGIN * 2), HEIGHT - (MARGIN * 2));
// Fullscreen toggle button register
- fullscreenButton = ButtonWidget.builder(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.button.fullscreen_toggle"), x -> {
+ fullscreenButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.button.fullscreen_toggle")
+ ), x -> {
isFullscreen = !isFullscreen;
}).build();
fullscreenButton.setDimensions(NORMAL_BUTTON_SIZE.x,NORMAL_BUTTON_SIZE.y);
addDrawableChild(fullscreenButton);
// Overlay toggle
- overlayToggleButton = ButtonWidget.builder(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.button.map_overlay_toggle"), x -> {
+ overlayToggleButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.button.map_overlay_toggle")
+ ), x -> {
mapWidget.setOverlayState(!mapWidget.isOverlayEnabled());
}).build();
overlayToggleButton.active = ClientConfigME.ENABLE_MAP_OVERLAY;
@@ -82,7 +89,9 @@ protected void init() {
addDrawableChild(overlayToggleButton);
// Recenter on player
- recenterButton = ButtonWidget.builder(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.button.recenter_on_player"), x -> {
+ recenterButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.button.recenter_on_player")
+ ), x -> {
Vector2d playerCoords = new Vector2d(playerBlockPos.getX(), playerBlockPos.getZ());
playerCoords.x /= MiddleEarthMapConfigs.FULL_MAP_SIZE;
playerCoords.y /= MiddleEarthMapConfigs.FULL_MAP_SIZE;
@@ -92,14 +101,18 @@ protected void init() {
addDrawableChild(recenterButton);
// Zoom in button register
- zoomInButton = ButtonWidget.builder(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.button.zoom_in"), x -> {
+ zoomInButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.button.zoom_in")
+ ), x -> {
mapWidget.zoomClick();
}).build();
zoomInButton.setDimensions(NORMAL_BUTTON_SIZE.x,NORMAL_BUTTON_SIZE.y);
addDrawableChild(zoomInButton);
// Zoom out button register
- zoomOutButton = ButtonWidget.builder(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.button.zoom_out"), x -> {
+ zoomOutButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.button.zoom_out")
+ ), x -> {
mapWidget.dezoomClick();
}).build();
zoomOutButton.setDimensions(NORMAL_BUTTON_SIZE.x,NORMAL_BUTTON_SIZE.y);
@@ -124,17 +137,29 @@ private void showCursorInformationTooltip(DrawContext context, int mouseX, int m
Vector2d mapRatio = mapWidget.getCurrentMapRatio(mouseX, mouseY);
if(mapRatio != null) {
List texts = new ArrayList<>();
- texts.add(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.tooltip.coordinates_title").formatted(Formatting.UNDERLINE));
+ texts.add(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.tooltip.coordinates_title")
+ ).formatted(Formatting.UNDERLINE));
double x = Math.round((mapRatio.x * MiddleEarthMapConfigs.FULL_MAP_SIZE) * 10) / 10.0;
double z = Math.round((mapRatio.y * MiddleEarthMapConfigs.FULL_MAP_SIZE) * 10) / 10.0;
- texts.add(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.tooltip.coordinates_label").formatted(Formatting.GRAY)
- .append(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.tooltip.coordinates_content", x, z).formatted(Formatting.WHITE)));
+ texts.add(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.tooltip.coordinates_label")
+ ).formatted(Formatting.GRAY)
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.tooltip.coordinates_content"),
+ x, z).formatted(Formatting.WHITE)));
MapBasedCustomBiome biome = mapWidget.getBiomeAt((int) (mapRatio.x * MiddleEarthMapConfigs.REGION_SIZE), (int) (mapRatio.y * MiddleEarthMapConfigs.REGION_SIZE));
- texts.add(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.tooltip.biome_label").formatted(Formatting.GRAY)
- .append(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.tooltip.biome_content", Text.translatable(biome.getBiome().getBiomeRegistryKey().getValue().toTranslationKey("biome"))).formatted(Formatting.WHITE)));
+ texts.add(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.tooltip.biome_label")
+ ).formatted(Formatting.GRAY)
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.tooltip.biome_content"),
+ Text.translatable(biome.getBiome().getBiomeRegistryKey().getValue().toTranslationKey("biome"))).formatted(Formatting.WHITE)));
if(hasTeleportPermission){
- texts.add(Text.translatable("ui." + MiddleEarth.MOD_ID + ".map_screen.tooltip.teleport_keybind", KeyInputHandler.mapTeleportKey.getBoundKeyLocalizedText().getString()).formatted(Formatting.ITALIC).withColor(ColorsME.PENDING.color));
+ texts.add(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "map_screen.tooltip.teleport_keybind"),
+ KeyInputHandler.mapTeleportKey.getBoundKeyLocalizedText().getString()).formatted(Formatting.ITALIC).withColor(ColorsME.PENDING.color));
}
context.drawTooltip(textRenderer, texts, mouseX, mouseY);
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/OnboardingSelectionScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/OnboardingSelectionScreen.java
index bec4aa7f11..e87b2c7c1e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/OnboardingSelectionScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/OnboardingSelectionScreen.java
@@ -12,6 +12,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Colors;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.gui.onboarding.onboarding_faction.OnboardingFactionScreenController;
import net.sevenstars.middleearth.network.packets.client2server.PacketTeleportToCurrentSpawn;
@@ -22,8 +23,10 @@
@Environment(EnvType.CLIENT)
public class OnboardingSelectionScreen extends Screen {
-private static final Text ONBOARDING_SELECTION_TITLE = Text.translatable("ui.%s.onboarding_selection.title".formatted(MiddleEarth.MOD_ID));
- private static final Identifier BUTTON_WIDGET = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/widget/button_widget.png");
+private static final Text ONBOARDING_SELECTION_TITLE = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "onboarding_selection.title")
+);
+ private static final Identifier BUTTON_WIDGET = MiddleEarth.id("textures/gui/widget/button_widget.png");
private boolean focusEnabled;
public ButtonWidget continueAsCharacterButton;
public ButtonWidget resetCharacterButton;
@@ -107,7 +110,9 @@ private void drawContent(DrawContext context) {
startX, startY, 0, continueAsCharacterButton.isFocused() || isMouseOver(startX, panelSizeX, startY, panelSizeY) ? 19 : 0,
panelSizeX, panelSizeY, 256, 256);
- Text continueText = Text.translatable("ui.%s.continue_character".formatted(MiddleEarth.MOD_ID));
+ Text continueText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "continue_character")
+ );
context.drawText(textRenderer, continueText,
startX + (int)((panelSizeX - textRenderer.getWidth(continueText)) / 2f),
startY + (int) ((panelSizeY / 2f) - (textRenderer.fontHeight / 2f)) + 1,
@@ -137,7 +142,9 @@ private void drawContent(DrawContext context) {
startX, startY,0, resetCharacterButton.isFocused() || isMouseOver(startX, panelSizeX, startY, panelSizeY) ? 19 : 0,
panelSizeX, panelSizeY, 256, 256);
- Text resetText = Text.translatable("ui.%s.reset_character".formatted(MiddleEarth.MOD_ID));
+ Text resetText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "reset_character")
+ );
context.drawText(textRenderer, resetText,
startX + (int) ((panelSizeX - textRenderer.getWidth(resetText)) / 2f),
startY + (int) ((panelSizeY / 2f) - (textRenderer.fontHeight / 2f)) + 1,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreen.java
index c140369981..07d89b7585 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreen.java
@@ -19,6 +19,7 @@
import net.minecraft.util.DyeColor;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.gui.render.states.BannerResultWithScaleGuiElementRenderState;
import net.sevenstars.middleearth.gui.utils.CycledSelectionButtonType;
@@ -36,8 +37,8 @@
@Environment(EnvType.CLIENT)
public class OnboardingFactionScreen extends Screen {
- private static final Identifier MAP_UI_IDENTIFIER = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/faction_selection_map.png");
- private static final Identifier BUTTON_UI_IDENTIFIER = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/faction_selection_buttons.png");
+ private static final Identifier MAP_UI_IDENTIFIER = MiddleEarth.id("textures/gui/faction_selection_map.png");
+ private static final Identifier BUTTON_UI_IDENTIFIER = MiddleEarth.id("textures/gui/faction_selection_buttons.png");
private static final int TEXT_COLOR = Color.BLACK.getRGB();
public class OnboardingFactionScreenElements {
@@ -59,7 +60,7 @@ public class OnboardingFactionScreenElements {
//endregion
//region [Text and Displays]
public DrawablePanel informationPanel =
- new DrawablePanel(169, 207, 0, 0, Identifier.of(MiddleEarth.MOD_ID,"textures/gui/faction_selection.png"));
+ new DrawablePanel(169, 207, 0, 0, MiddleEarth.id("textures/gui/faction_selection.png"));
public DrawablePanel mapPanel =
new DrawablePanel(124, 124, 0, 0, MAP_UI_IDENTIFIER);
@@ -97,7 +98,9 @@ public void draw(DrawContext context, int startX, int startY){
}
}
- private static final Text TITLE = Text.translatable("screen." + MiddleEarth.MOD_ID + ".onboarding_faction_screen");
+ private static final Text TITLE = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "onboarding_faction_screen")
+ );
// Public fields
@@ -156,20 +159,28 @@ protected void init() {
elements.subfactionSelectionWidget.getButtons().forEach(this::addDrawableChild);
// PlayerFactionPayload Randomizer
- elements.npcRandomizerButton = ButtonWidget.builder(Text.translatable("screen." + MiddleEarth.MOD_ID + ".button.faction_randomizer"),
+ elements.npcRandomizerButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "button.faction_randomizer")
+ ),
x -> this.controller.randomizeNpc()).build();
addDrawableChild(elements.npcRandomizerButton);
// Map Widget
- elements.mapFocusButton = ButtonWidget.builder(Text.translatable("screen." + MiddleEarth.MOD_ID + ".button.focus_current"), this::mapFocusToggle).build(); // TODO
+ elements.mapFocusButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "button.focus_current")
+ ), this::mapFocusToggle).build(); // TODO
elements.mapFocusButton.setDimensions(10, 10);
addDrawableChild(elements.mapFocusButton);
- elements.mapZoomInButton = ButtonWidget.builder(Text.translatable("screen." + MiddleEarth.MOD_ID + ".button.zoom_in"), this::mapZoomIn).build();
+ elements.mapZoomInButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "button.zoom_in")
+ ), this::mapZoomIn).build();
elements.mapZoomInButton.setDimensions(10, 10);
addDrawableChild(elements.mapZoomInButton);
- elements.mapZoomOutButton = ButtonWidget.builder(Text.translatable("screen." + MiddleEarth.MOD_ID + ".button.zoom_out"), this::mapZoomOut).build();
+ elements.mapZoomOutButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "button.zoom_out")
+ ), this::mapZoomOut).build();
elements.mapZoomOutButton.setDimensions(10, 10);
addDrawableChild(elements.mapZoomOutButton);
@@ -192,11 +203,15 @@ protected void init() {
// Random spawn selection
- elements.fullRandomizerButton = ButtonWidget.builder(Text.translatable("screen." + MiddleEarth.MOD_ID + ".button.full_randomizer"),
+ elements.fullRandomizerButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "button.full_randomizer")
+ ),
x -> controller.randomizeAll()).build();
addDrawableChild(elements.fullRandomizerButton);
- elements.spawnConfirmButton = ButtonWidget.builder(Text.translatable("screen." + MiddleEarth.MOD_ID + ".button.confirm"),
+ elements.spawnConfirmButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "button.confirm")
+ ),
x -> controller.confirmSelection()).build();
addDrawableChild(elements.spawnConfirmButton);
@@ -255,7 +270,9 @@ private void renderDisplays(DrawContext context, int mouseX, int mouseY, float d
// Subfaction
if(elements.subfactionName != null){
startY += textRenderer.fontHeight + 3;
- Text subfactionTitle = Text.translatable("screen." + MiddleEarth.MOD_ID + ".information.subfaction");
+ Text subfactionTitle = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "information.subfaction")
+ );
context.drawText(textRenderer, subfactionTitle, startX, startY, TEXT_COLOR, false);
context.drawText(textRenderer, elements.subfactionName, startX + textRenderer.getWidth(subfactionTitle), startY, TEXT_COLOR, false);
@@ -265,9 +282,12 @@ private void renderDisplays(DrawContext context, int mouseX, int mouseY, float d
startY += textRenderer.fontHeight + 3;
var text = elements.raceList.getValue().getFirst().getString();
boolean hasManyRaces = text.contains(",");
- Text raceTitle = Text.translatable((hasManyRaces)
- ? "screen." + MiddleEarth.MOD_ID + ".information.races.many"
- : "screen." + MiddleEarth.MOD_ID + ".information.races").formatted(Formatting.UNDERLINE);
+ Text raceTitle = Text.translatable(
+ (hasManyRaces)
+ ? MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "information.races.many")
+ : MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "information.races")
+ ).formatted(Formatting.UNDERLINE);
+
context.drawText(client.textRenderer, raceTitle, startX, startY, TEXT_COLOR, false);
startY += textRenderer.fontHeight + 3;
@@ -279,7 +299,9 @@ private void renderDisplays(DrawContext context, int mouseX, int mouseY, float d
startY = elements.informationPanel.startY + 90;
- context.drawText(client.textRenderer, Text.translatable("screen." + MiddleEarth.MOD_ID + ".information.description").formatted(Formatting.UNDERLINE),
+ context.drawText(client.textRenderer, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "information.description")
+ ).formatted(Formatting.UNDERLINE),
startX,startY - textRenderer.fontHeight, TEXT_COLOR, false);
startY += 3;
elements.descriptionTextBlock.setStartX(startX);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreenController.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreenController.java
index ac67c73dc9..462a795ce4 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreenController.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/onboarding/onboarding_faction/OnboardingFactionScreenController.java
@@ -15,6 +15,7 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.entity.EntitiesME;
import net.sevenstars.middleearth.entity.npcs.NpcEntity;
@@ -40,7 +41,9 @@
public class OnboardingFactionScreenController {
public static OnboardingFactionScreenController INSTANCE;
- private static final Text TITLE = Text.translatable("screen." + MiddleEarth.MOD_ID + ".onboarding_faction_screen");
+ private static final Text TITLE = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "onboarding_faction_screen")
+ );
private static final float DEFAULT_DELAY = 3;
World world;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/playerbook/PlayerBookScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/playerbook/PlayerBookScreen.java
index da20b7f08c..6da296fbe4 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/playerbook/PlayerBookScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/playerbook/PlayerBookScreen.java
@@ -18,6 +18,7 @@
import net.minecraft.util.Colors;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.entity.EntitiesME;
import net.sevenstars.middleearth.entity.spider.scuttler.ShelobiteScuttlerEntity;
@@ -33,7 +34,7 @@
@Environment(EnvType.CLIENT)
public class PlayerBookScreen extends Screen {
- private static final Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID, "textures/gui/player_book.png");
+ private static final Identifier TEXTURE = MiddleEarth.id("textures/gui/player_book.png");
private static final String PATH = "textures/gui/playerbook/";
private static final int WIDTH = 320;
private static final int HEIGHT = 220;
@@ -75,21 +76,31 @@ public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks
WIDTH, HEIGHT, 384, 384);
if(currentPage == 0) {
- drawScaledText(textRenderer, context, Text.translatable("screen." + MiddleEarth.MOD_ID + ".playerbook.title").formatted(Formatting.UNDERLINE).formatted(Formatting.BOLD),
+ drawScaledText(textRenderer, context, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "playerbook.title")
+ ).formatted(Formatting.UNDERLINE).formatted(Formatting.BOLD),
startX + (int)(WIDTH * 0.325), startY + (int)(HEIGHT * 0.11f), 1.5f, Colors.BLACK, true);
- context.drawWrappedText(textRenderer, Text.translatable("screen." + MiddleEarth.MOD_ID + ".playerbook.description"), startX + 38, startY + (int)(HEIGHT * 0.22f), 116, Colors.BLACK, false);
+ context.drawWrappedText(textRenderer, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "playerbook.description")
+ ), startX + 38, startY + (int)(HEIGHT * 0.22f), 116, Colors.BLACK, false);
- drawScaledText(textRenderer, context, Text.translatable("screen." + MiddleEarth.MOD_ID + ".playerbook.chapters").formatted(Formatting.UNDERLINE).formatted(Formatting.BOLD),
+ drawScaledText(textRenderer, context, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "playerbook.chapters")
+ ).formatted(Formatting.UNDERLINE).formatted(Formatting.BOLD),
startX + (int)(WIDTH * 0.75), startY + (int)(HEIGHT * 0.11f), 1.5f, Colors.BLACK, true);
int index = 0;
for(Chapter chapter : chapters) {
- MutableText text = Text.translatable("screen." + MiddleEarth.MOD_ID + "." + chapter.name);
+ MutableText text = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, chapter.name)
+ );
int startTooltipX = centerX + 30;
int startTooltipY = (context.getScaledWindowHeight() / 2) - (int)(HEIGHT * 0.295f) + (index * 18);
if (mouseX >= startTooltipX && mouseX <= startTooltipX + (chapter.name.length() * 4.75) + 5 && mouseY >= startTooltipY && mouseY <= startTooltipY + 9) {
context.drawOrderedTooltip(this.client.textRenderer, Lists.transform(
- List.of(Text.translatable("screen." + MiddleEarth.MOD_ID + ".playerbook.navigate_to")
+ List.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, "playerbook.navigate_to")
+ )
), Text::asOrderedText), mouseX, mouseY);
text.formatted(Formatting.UNDERLINE);
}
@@ -101,7 +112,9 @@ public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks
} else {
PlayerBookPageData pageData = chaptersPages.get(currentChapter).get(currentPage - 1);
if(pageData != null) {
- drawScaledText(textRenderer, context, Text.translatable("screen." + MiddleEarth.MOD_ID + "." + pageData.leftPageTitle).formatted(Formatting.UNDERLINE),
+ drawScaledText(textRenderer, context, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, pageData.leftPageTitle)
+ ).formatted(Formatting.UNDERLINE),
startX + (int)(WIDTH * 0.3), startY + (int)(HEIGHT * 0.11f), 1.25f, Colors.BLACK, true);
if(pageData.image != null) {
@@ -110,9 +123,13 @@ public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks
WIDTH, HEIGHT, 320, 320);
}
- context.drawWrappedText(textRenderer, Text.translatable("screen." + MiddleEarth.MOD_ID + "." + pageData.leftPageDescription),
+ context.drawWrappedText(textRenderer, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, pageData.leftPageDescription)
+ ),
startX + 38, startY + (int)(HEIGHT * 0.2f), 116, Colors.BLACK, false);
- context.drawWrappedText(textRenderer, Text.translatable("screen." + MiddleEarth.MOD_ID + "." + pageData.rightPageDescription),
+ context.drawWrappedText(textRenderer, Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SCREEN, pageData.rightPageDescription)
+ ),
startX + (int)(WIDTH * 0.5f) + 16, startY + (int)(HEIGHT * 0.16f), 114, Colors.BLACK, false);
}
}
@@ -206,55 +223,55 @@ public Chapter(String name, PlayerBookChapters chapter, Item icon) {
static {
chaptersPages = new HashMap<>();
chaptersPages.put(PlayerBookChapters.GETTING_STARTED, List.of(
- new PlayerBookPageData().withTitle("playerbook.chapter_getting_started").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "getting_started1.png"))
+ new PlayerBookPageData().withTitle("playerbook.chapter_getting_started").withImage(MiddleEarth.id(PATH + "getting_started1.png"))
.withLeftPageDesc("playerbook.getting_started_desc")
.withRightPageDesc("playerbook.getting_started_desc_right")
));
chaptersPages.put(PlayerBookChapters.MINING, List.of(
- new PlayerBookPageData().withTitle("playerbook.chapter_mining").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "mining1.png"))
+ new PlayerBookPageData().withTitle("playerbook.chapter_mining").withImage(MiddleEarth.id(PATH + "mining1.png"))
.withLeftPageDesc("playerbook.mining_desc")
.withRightPageDesc("playerbook.mining_desc_right"),
new PlayerBookPageData().withTitle("playerbook.tools")
.withLeftPageDesc("playerbook.mining_tools_desc")
.withRightPageDesc("playerbook.mining_tools_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.cave_monsters").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "mining3.png"))
+ new PlayerBookPageData().withTitle("playerbook.cave_monsters").withImage(MiddleEarth.id(PATH + "mining3.png"))
.withLeftPageDesc("playerbook.mining_cave_monster_desc")
.withRightPageDesc("playerbook.mining_cave_monster_desc_right")
));
chaptersPages.put(PlayerBookChapters.SMITHING, List.of(
- new PlayerBookPageData().withTitle("playerbook.chapter_smithing").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing1.png"))
+ new PlayerBookPageData().withTitle("playerbook.chapter_smithing").withImage(MiddleEarth.id(PATH + "smithing1.png"))
.withLeftPageDesc("playerbook.smithing_desc")
.withRightPageDesc("playerbook.smithing_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.copper_alloys").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing2.png"))
+ new PlayerBookPageData().withTitle("playerbook.copper_alloys").withImage(MiddleEarth.id(PATH + "smithing2.png"))
.withLeftPageDesc("playerbook.smithing_copper_alloys_smithing_desc")
.withRightPageDesc("playerbook.smithing_copper_alloys_smithing_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.casting").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing3.png"))
+ new PlayerBookPageData().withTitle("playerbook.casting").withImage(MiddleEarth.id(PATH + "smithing3.png"))
.withLeftPageDesc("playerbook.smithing_casting_desc")
.withRightPageDesc("playerbook.smithing_casting_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.shaping_anvil").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing4.png"))
+ new PlayerBookPageData().withTitle("playerbook.shaping_anvil").withImage(MiddleEarth.id(PATH + "smithing4.png"))
.withLeftPageDesc("playerbook.smithing_shaping_anvil_desc")
.withRightPageDesc("playerbook.smithing_shaping_anvil_desc_right"),
new PlayerBookPageData().withTitle("playerbook.shaping_anvil")
.withLeftPageDesc("playerbook.smithing_shaping_anvil_1_desc")
.withRightPageDesc("playerbook.smithing_shaping_anvil_1_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.quenching").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing5.png"))
+ new PlayerBookPageData().withTitle("playerbook.quenching").withImage(MiddleEarth.id(PATH + "smithing5.png"))
.withLeftPageDesc("playerbook.smithing_quenching_desc")
.withRightPageDesc("playerbook.smithing_quenching_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.artisan_table").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing6.png"))
+ new PlayerBookPageData().withTitle("playerbook.artisan_table").withImage(MiddleEarth.id(PATH + "smithing6.png"))
.withLeftPageDesc("playerbook.smithing_artisan_table_desc")
.withRightPageDesc("playerbook.smithing_artisan_table_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.artisan_table").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "smithing7.png"))
+ new PlayerBookPageData().withTitle("playerbook.artisan_table").withImage(MiddleEarth.id(PATH + "smithing7.png"))
.withLeftPageDesc("playerbook.smithing_artisan_table_1_desc")
.withRightPageDesc("playerbook.smithing_artisan_table_1_desc_right")
));
chaptersPages.put(PlayerBookChapters.ENCHANTING, List.of(
- new PlayerBookPageData().withTitle("playerbook.chapter_enchanting").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "enchanting1.png"))
+ new PlayerBookPageData().withTitle("playerbook.chapter_enchanting").withImage(MiddleEarth.id(PATH + "enchanting1.png"))
.withLeftPageDesc("playerbook.enchanting_desc")
.withRightPageDesc("playerbook.enchanting_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.inscription_table").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "enchanting2.png"))
+ new PlayerBookPageData().withTitle("playerbook.inscription_table").withImage(MiddleEarth.id(PATH + "enchanting2.png"))
.withLeftPageDesc("playerbook.inscription_table_desc")
.withRightPageDesc("playerbook.inscription_table_desc_right")
));
@@ -263,16 +280,16 @@ public Chapter(String name, PlayerBookChapters chapter, Item icon) {
new PlayerBookPageData().withTitle("playerbook.chapter_mounts")
.withLeftPageDesc("playerbook.mounts_desc")
.withRightPageDesc("playerbook.mounts_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.broadhoof_goat").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "mount_broadhoof_goat.png"))
+ new PlayerBookPageData().withTitle("playerbook.broadhoof_goat").withImage(MiddleEarth.id(PATH + "mount_broadhoof_goat.png"))
.withLeftPageDesc("playerbook.mount_broadhoof_goat_desc")
.withRightPageDesc("playerbook.mount_broadhoof_goat_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.great_horn").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "mount_great_horn.png"))
+ new PlayerBookPageData().withTitle("playerbook.great_horn").withImage(MiddleEarth.id(PATH + "mount_great_horn.png"))
.withLeftPageDesc("playerbook.mount_great_horn_desc")
.withRightPageDesc("playerbook.mount_great_horn_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.warg").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "mount_warg.png"))
+ new PlayerBookPageData().withTitle("playerbook.warg").withImage(MiddleEarth.id(PATH + "mount_warg.png"))
.withLeftPageDesc("playerbook.mount_warg_desc")
.withRightPageDesc("playerbook.mount_warg_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.cave_troll").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "mount_cave_troll.png"))
+ new PlayerBookPageData().withTitle("playerbook.cave_troll").withImage(MiddleEarth.id(PATH + "mount_cave_troll.png"))
.withLeftPageDesc("playerbook.mount_cave_troll_desc")
.withRightPageDesc("playerbook.mount_cave_troll_desc_right")
));
@@ -281,10 +298,10 @@ public Chapter(String name, PlayerBookChapters chapter, Item icon) {
new PlayerBookPageData().withTitle("playerbook.chapter_dungeons")
.withLeftPageDesc("playerbook.dungeons_desc")
.withRightPageDesc("playerbook.dungeons_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.brigands").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "dungeon_brigands.png"))
+ new PlayerBookPageData().withTitle("playerbook.brigands").withImage(MiddleEarth.id(PATH + "dungeon_brigands.png"))
.withLeftPageDesc("playerbook.dungeon_brigands_desc")
.withRightPageDesc("playerbook.dungeon_brigands_desc_right"),
- new PlayerBookPageData().withTitle("playerbook.spider_burrows").withImage(Identifier.of(MiddleEarth.MOD_ID, PATH + "dungeon_spider_burrows.png"))
+ new PlayerBookPageData().withTitle("playerbook.spider_burrows").withImage(MiddleEarth.id(PATH + "dungeon_spider_burrows.png"))
.withLeftPageDesc("playerbook.dungeon_spider_burrows_desc")
.withRightPageDesc("playerbook.dungeon_spider_burrows_desc_right")
));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/return_confirmation/ReturnConfirmationScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/return_confirmation/ReturnConfirmationScreen.java
index 57d65267d8..3c53fc06a6 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/return_confirmation/ReturnConfirmationScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/return_confirmation/ReturnConfirmationScreen.java
@@ -8,6 +8,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Colors;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.gui.utils.widgets.CustomWidget;
import net.sevenstars.middleearth.network.packets.client2server.PacketTeleportToCurrentOverworldSpawn;
@@ -15,8 +16,10 @@
import java.awt.event.KeyEvent;
public class ReturnConfirmationScreen extends Screen {
- private static final Text RETURN_CONFIRMATION_TITLE = Text.translatable("ui.%s.return_confirmation.title".formatted(MiddleEarth.MOD_ID));
- private static final Identifier BUTTON_WIDGET = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/widget/button_widget.png");
+ private static final Text RETURN_CONFIRMATION_TITLE = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "return_confirmation.title")
+ );
+ private static final Identifier BUTTON_WIDGET = MiddleEarth.id("textures/gui/widget/button_widget.png");
public ButtonWidget returnToOverworldButton;
public ButtonWidget closeButton;
float currentDelay;
@@ -30,7 +33,9 @@ protected void init() {
ButtonWidget.PressAction returnToOverworldAction = button -> {
returnToOverworld();
};
- returnToOverworldButton = ButtonWidget.builder(Text.translatable("ui.%s.return_confirmation.continue_character.title".formatted(MiddleEarth.MOD_ID)), returnToOverworldAction).build();
+ returnToOverworldButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "return_confirmation.continue_character.title")
+ ), returnToOverworldAction).build();
addDrawableChild(returnToOverworldButton);
if(currentDelay > 0)
returnToOverworldButton.active = false;
@@ -70,7 +75,9 @@ private void drawContent(DrawContext context) {
startX, startY,0, returnToOverworldButton.isFocused() || isMouseOver(startX, panelSizeX, startY, panelSizeY) ? 19 : 0,
panelSizeX, panelSizeY, 256, 256);
- Text continueText = Text.translatable("ui.%s.return_confirmation.continue_character.content".formatted(MiddleEarth.MOD_ID));
+ Text continueText = Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "return_confirmation.continue_character.content")
+ );
context.drawText(textRenderer, continueText,
startX + (int)((panelSizeX - textRenderer.getWidth(continueText)) / 2f),
startY + (int) ((panelSizeY / 2f) - (textRenderer.fontHeight / 2f)) + 1,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/shapinganvil/ShapingAnvilScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/shapinganvil/ShapingAnvilScreen.java
index 539ad8f67f..6e6931a048 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/shapinganvil/ShapingAnvilScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/shapinganvil/ShapingAnvilScreen.java
@@ -13,6 +13,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.network.packets.client2server.AnvilIndexPacket;
@@ -137,8 +138,13 @@ private void renderHammerTooltip(DrawContext context, int mouseX, int mouseY) {
if (mouseX >= x + 79 && mouseX <= x + 96 && mouseY >= y + 34 && mouseY <= y + 51){
context.drawOrderedTooltip(this.client.textRenderer,
- Lists.transform(List.of(Text.translatable("tooltip." + MiddleEarth.MOD_ID +".anvil_hammer"),
- Text.translatable("tooltip." + MiddleEarth.MOD_ID +".anvil_hammer_2")),
+ Lists.transform(
+ List.of(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "anvil_hammer")
+ ),
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "anvil_hammer_2")
+ )),
Text::asOrderedText), mouseX, mouseY);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/CycledSelectionWidget.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/CycledSelectionWidget.java
index cd4d7e1a98..8d611704f1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/CycledSelectionWidget.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/CycledSelectionWidget.java
@@ -15,7 +15,7 @@
import java.util.List;
public class CycledSelectionWidget extends CustomWidget {
- private static final Identifier TEXTURE = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/widget/cycled_selection_widget.png");
+ private static final Identifier TEXTURE = MiddleEarth.id("textures/gui/widget/cycled_selection_widget.png");
boolean leftCanBeActive = true;
boolean rightCanBeActive = true;
boolean centerCanBeActive = true;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/PlayableNpcPreviewWidget.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/PlayableNpcPreviewWidget.java
index 31f7aa2e67..7f7e449202 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/PlayableNpcPreviewWidget.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/PlayableNpcPreviewWidget.java
@@ -24,7 +24,7 @@
import java.util.List;
public class PlayableNpcPreviewWidget extends CustomWidget {
- private static final Identifier NPC_PREVIEW = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/widget/npc_preview_widget.png");
+ private static final Identifier NPC_PREVIEW = MiddleEarth.id("textures/gui/widget/npc_preview_widget.png");
private static final int TICK_DELAY = 10;
private static final int MINIMAL_MARGIN = 4;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/SearchBarWidget.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/SearchBarWidget.java
index 31ec8aa056..ef2d71a060 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/SearchBarWidget.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/SearchBarWidget.java
@@ -11,6 +11,7 @@
import net.minecraft.util.Colors;
import net.minecraft.util.Identifier;
import net.minecraft.util.StringHelper;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.gui.utils.widgets.searchbar.SearchBarResult;
import net.sevenstars.middleearth.gui.utils.widgets.searchbar.SearchBarResultType;
@@ -20,7 +21,7 @@
import java.util.List;
public class SearchBarWidget extends CustomWidget {
- private static final Identifier SEARCH_WIDGET = Identifier.of(MiddleEarth.MOD_ID, "textures/gui/widget/search_widget.png");
+ private static final Identifier SEARCH_WIDGET = MiddleEarth.id("textures/gui/widget/search_widget.png");
private static final List KEYS_TO_IGNORE = List.of(260, 262, 264, 263, 265, 266, 267, 268, 269);
private static final int MINIMAL_MARGIN = 4;
public int desiredWidth;
@@ -54,11 +55,15 @@ public SearchBarWidget(int maxAmountOnScreen, List allPossibleR
if (!searchBarToggle)
searchBarToggle = true;
};
- searchBarToggleButton = ButtonWidget.builder(Text.translatable("ui.%s.search.toggle_button".formatted(MiddleEarth.MOD_ID)), searchBarInputToggle).build();
+ searchBarToggleButton = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "search.toggle_button")
+ ), searchBarInputToggle).build();
searchBarToggleButton.setDimensions(desiredWidth, searchBarToggleButton.getHeight());
// Screen click
- screenClick = ButtonWidget.builder(Text.translatable("ui.%s.search.screen_click_button".formatted(MiddleEarth.MOD_ID)), button -> clickOnScreen(button, additionalScreenClickAction)).build();
+ screenClick = ButtonWidget.builder(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "search.screen_click_button")
+ ), button -> clickOnScreen(button, additionalScreenClickAction)).build();
screenClick.setAlpha(0);
screenClick.setMessage(Text.of(""));
@@ -116,7 +121,11 @@ public int drawSearchBar(DrawContext context, int startX, int startY, TextRender
searchBarToggleButton.setDimensionsAndPosition(desiredWidth, panelSizeY, startX, startY);
drawSearchBarBackground(context, SEARCH_WIDGET, startX, startY);
- MutableText text = Text.translatable((!searchBarToggle && searchBarInput.isEmpty()) ? "ui.%s.search.label".formatted(MiddleEarth.MOD_ID) : searchBarInput);
+ MutableText text = Text.translatable(
+ (!searchBarToggle && searchBarInput.isEmpty())
+ ? MiddleEarth.rawTranslationKeyWithModId(LangCategory.UI, "search.label")
+ : searchBarInput
+ );
context.drawText(textRenderer, text,
startX + magnifyingGlassSizeX + MINIMAL_MARGIN - 1,
startY + (int) ((panelSizeY / 2f) - (textRenderer.fontHeight / 2f)) + 1,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/backgrounds/types/BackgroundContainerTypes.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/backgrounds/types/BackgroundContainerTypes.java
index 4d9dc4b5fc..33d613d08f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/backgrounds/types/BackgroundContainerTypes.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/backgrounds/types/BackgroundContainerTypes.java
@@ -6,7 +6,7 @@
import org.joml.Vector2i;
public enum BackgroundContainerTypes {
- FULLSCREEN_MAP(Identifier.of(MiddleEarth.MOD_ID,"textures/gui/map_background.png"), 5, 1, 209);
+ FULLSCREEN_MAP(MiddleEarth.id("textures/gui/map_background.png"), 5, 1, 209);
public final Identifier textureId;
public final int size;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/FactionSelectionMapWidget.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/FactionSelectionMapWidget.java
index 2fdf4f4182..70404c7aff 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/FactionSelectionMapWidget.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/FactionSelectionMapWidget.java
@@ -1,5 +1,6 @@
package net.sevenstars.middleearth.gui.utils.widgets.map;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.gui.onboarding.onboarding_faction.OnboardingFactionScreenController;
import net.sevenstars.middleearth.gui.utils.widgets.map.types.MapMarkerType;
@@ -28,7 +29,9 @@ public FactionSelectionMapWidget(int mapWidth, int mapHeight, int maxMarkerAmoun
new Rectangle2D.Double(0, 0, uiWidth, uiHeight - 11));
spawnMapMarkers[i].setType(MapMarkerType.DYNAMIC_SPAWN);
}
- MapMarkerWidget.setTitle(Text.translatable("widget.%s.spawn_tooltip_title".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.UNDERLINE));
+ MapMarkerWidget.setTitle(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.WIDGET, "spawn_tooltip_title")
+ ).formatted(Formatting.UNDERLINE));
}
public ButtonWidget[] getButtons() {
ButtonWidget[] spawnButtonArray = new ButtonWidget[spawnMapMarkers.length];
@@ -74,18 +77,34 @@ protected void draw(DrawContext context, int startX, int startY) {
mapMarker.computeFromMapPosition(this, coordinates);
mapMarker.setContent(
List.of(
- Text.translatable("spawn." + spawnData.getIdentifier().toTranslationKey()).formatted(Formatting.GOLD),
- Text.translatable("widget.%s.marker.margin_front".formatted(MiddleEarth.MOD_ID)).append(Text.translatable("spawn.%s.coordinates_base.dynamic".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.GRAY)
- .append(Text.translatable("spawn.%s.coordinates_base_values.dynamic".formatted(MiddleEarth.MOD_ID), spawnData.getWorldCoordinates().x, spawnData.getWorldCoordinates().z).formatted(Formatting.WHITE)))
+ Text.translatable(
+ "spawn." + spawnData.getIdentifier().toTranslationKey()
+ ).formatted(Formatting.GOLD),
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.WIDGET, "marker.margin_front")
+ ).append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SPAWN, "coordinates_base.dynamic")
+ ).formatted(Formatting.GRAY)
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SPAWN, "coordinates_base_values.dynamic"),
+ spawnData.getWorldCoordinates().x, spawnData.getWorldCoordinates().z).formatted(Formatting.WHITE)))
));
} else {
mapMarker.setType(MapMarkerType.CUSTOM_SPAWN);
mapMarker.computeFromWorldPosition(this, coordinates);
mapMarker.setContent(
List.of(
- Text.translatable("spawn." + spawnData.getIdentifier().toTranslationKey()).formatted(Formatting.GOLD),
- Text.translatable("widget.%s.marker.margin_front".formatted(MiddleEarth.MOD_ID)).append(Text.translatable("spawn.%s.coordinates_base.custom".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.GRAY)
- .append(Text.translatable("spawn.%s.coordinates_base_values.custom".formatted(MiddleEarth.MOD_ID), spawnData.getWorldCoordinates().x, spawnData.getWorldCoordinates().y, spawnData.getWorldCoordinates().z).formatted(Formatting.WHITE)))
+ Text.translatable(
+ "spawn." + spawnData.getIdentifier().toTranslationKey()
+ ).formatted(Formatting.GOLD),
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.WIDGET, "marker.margin_front")
+ ).append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SPAWN, "coordinates_base.custom")
+ ).formatted(Formatting.GRAY)
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SPAWN, "coordinates_base_values.custom"),
+ spawnData.getWorldCoordinates().x, spawnData.getWorldCoordinates().y, spawnData.getWorldCoordinates().z).formatted(Formatting.WHITE)))
));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapMarkerWidget.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapMarkerWidget.java
index b1a4ce9ad3..6f2063bff0 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapMarkerWidget.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapMarkerWidget.java
@@ -1,6 +1,7 @@
package net.sevenstars.middleearth.gui.utils.widgets.map;
import net.minecraft.client.gl.RenderPipelines;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.gui.utils.widgets.CustomWidget;
import net.sevenstars.middleearth.gui.utils.widgets.UiDirections;
@@ -21,8 +22,8 @@
import java.util.Optional;
public class MapMarkerWidget extends CustomWidget {
- private static final Identifier MAP_MARKERS = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/widget/map_markers.png");
- private static final Identifier MAP_ARROWS = Identifier.of(MiddleEarth.MOD_ID,"textures/gui/widget/map_arrows.png");
+ private static final Identifier MAP_MARKERS = MiddleEarth.id("textures/gui/widget/map_markers.png");
+ private static final Identifier MAP_ARROWS = MiddleEarth.id("textures/gui/widget/map_arrows.png");
private ButtonWidget markerButton;
private MapMarkerType type;
@@ -169,7 +170,9 @@ public void draw(DrawContext context) {
texts.addAll(childs.get(i).getContent());
}
if(childs.size() > maxChildDisplay){
- texts.add(Text.translatable("widget.%s.marker.more".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.BLUE));
+ texts.add(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.WIDGET, "marker.more")
+ ).formatted(Formatting.BLUE));
}
}
context.drawTooltip(client.textRenderer, texts, Optional.empty(), drawStart.x + (drawSize.x / 2), drawStart.y + (drawSize.y / 2));
@@ -194,9 +197,13 @@ private List getContent() {
if(isSelected){
List modifiedList = new ArrayList<>();
modifiedList.add(
- Text.translatable("widget.%s.marker.selected_title_container.before".formatted(MiddleEarth.MOD_ID))
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.WIDGET, "marker.selected_title_container.before")
+ )
.append(content.get(0).copy().withColor(ColorsME.SUCCESS.color))
- .append(Text.translatable("widget.%s.marker.selected_title_container.after".formatted(MiddleEarth.MOD_ID))));
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.WIDGET, "marker.selected_title_container.after")
+ )));
for(int i = 1; i < content.size(); i++){
modifiedList.add(content.get(i));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapWidget.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapWidget.java
index 98ac9ded73..b34c48a1ee 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapWidget.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/map/MapWidget.java
@@ -76,10 +76,10 @@ private float getMinZoom(){
return 1f;
}
protected Identifier getMapTexture(){
- return Identifier.of(MiddleEarth.MOD_ID,"textures/map.png");
+ return MiddleEarth.id("textures/map.png");
}
protected Identifier getOverlayMapTexture(){
- return Identifier.of(MiddleEarth.MOD_ID,"textures/map_overlay.png");
+ return MiddleEarth.id("textures/map_overlay.png");
}
public void setOverlayState(boolean state){
isOverlayEnabled = state;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/searchbar/SearchBarResultType.java b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/searchbar/SearchBarResultType.java
index acab706598..b0ce8c98f1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/searchbar/SearchBarResultType.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/gui/utils/widgets/searchbar/SearchBarResultType.java
@@ -5,8 +5,8 @@
public enum SearchBarResultType
{
- NORMAL(Identifier.of(MiddleEarth.MOD_ID, "textures/gui/widget/search_widget.png"), 0,75, 0, 89),
- SUB(Identifier.of(MiddleEarth.MOD_ID, "textures/gui/widget/search_widget.png"), 0,103, 0, 117);
+ NORMAL(MiddleEarth.id("textures/gui/widget/search_widget.png"), 0,75, 0, 89),
+ SUB(MiddleEarth.id("textures/gui/widget/search_widget.png"), 0,103, 0, 117);
public static final int WIDTH = 93;
public static final int HEIGHT = 14;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/DataComponentTypesME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/DataComponentTypesME.java
index 1872c7a412..6f4135e946 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/DataComponentTypesME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/DataComponentTypesME.java
@@ -78,10 +78,10 @@ public class DataComponentTypesME {
private static ComponentType register(String id, UnaryOperator> builderOperator) {
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.DATA_COMPONENT_TYPE, id));
- return Registry.register(Registries.DATA_COMPONENT_TYPE, Identifier.of(MiddleEarth.MOD_ID, id), ((ComponentType.Builder)builderOperator.apply(ComponentType.builder())).build());
+ return Registry.register(Registries.DATA_COMPONENT_TYPE, MiddleEarth.id(id), ((ComponentType.Builder)builderOperator.apply(ComponentType.builder())).build());
}
public static void registerModComponentTypes() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Component Types Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Component Types Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/DecorativeItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/DecorativeItemsME.java
index c69b57829a..0f9b048db5 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/DecorativeItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/DecorativeItemsME.java
@@ -245,10 +245,10 @@ private static Item registerItem(String name, Function fact
ItemGroupsME.DECORATIVES_BLOCKS_CONTENT.add(item.getDefaultStack());
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Decorative Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Decorative Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/EggItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/EggItemsME.java
index 8c5cea39db..973a52adf1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/EggItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/EggItemsME.java
@@ -57,18 +57,18 @@ private static Item registerItem(String name, Function fact
SimpleItemModel.items.add(item);
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
private static Item registerSpecialEgg(String name, Function factory, Item.Settings settings) {
Item item = (Item)factory.apply(settings.registryKey(BlockRegistryME.keyOfItem(name)));
ItemGroupsME.SPAWN_EGGS_CONTENTS.add(item.getDefaultStack());
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Egg Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Egg Items");
TranslationEntries.spawnEggEntries.add(MiddleEarth.id("npc_random_spawn_egg"));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/EquipmentItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/EquipmentItemsME.java
index e3074f1b3c..7fb78cc85d 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/EquipmentItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/EquipmentItemsME.java
@@ -2191,7 +2191,7 @@ private static Item registerItem(Item item, String name){
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Equipment Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Equipment Items");
ArmorTags.registerRecipesTemplates();
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/FoodItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/FoodItemsME.java
index d20f6bf17c..e72a01af3a 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/FoodItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/FoodItemsME.java
@@ -132,10 +132,10 @@ private static Item registerItem(String name, Function fact
ItemGroupsME.FOOD_CONTENTS.add(item.getDefaultStack());
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Food Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Food Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/NatureBlockItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/NatureBlockItemsME.java
index 462aec2cd1..f32d06670f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/NatureBlockItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/NatureBlockItemsME.java
@@ -44,10 +44,10 @@ private static Item registerItem(String name, Function fact
ItemGroupsME.NATURE_BLOCKS_CONTENTS.add(item.getDefaultStack());
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Nature Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Nature Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/ResourceItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/ResourceItemsME.java
index 53c9d3e763..52ef09074d 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/ResourceItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/ResourceItemsME.java
@@ -306,16 +306,16 @@ private static Item registerItem(String name, Function fact
ItemGroupsME.RESOURCES_CONTENTS.add(item.getDefaultStack());
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
private static Item registerHiddenItem(String name, Function factory, Item.Settings settings) {
Item item = factory.apply(settings.registryKey(BlockRegistryME.keyOfItem(name)));
TranslationEntries.itemEntries.add(item);
RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.ITEM, name));
- return Registry.register(Registries.ITEM, Identifier.of(MiddleEarth.MOD_ID, name), item);
+ return Registry.register(Registries.ITEM, MiddleEarth.id(name), item);
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Resource Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Resource Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/ToolItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/ToolItemsME.java
index 71f26d4f9a..0ccf99b775 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/ToolItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/ToolItemsME.java
@@ -188,7 +188,7 @@ private static Item registerItem(Item item, String name){
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Tool Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Tool Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/WeaponItemsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/WeaponItemsME.java
index 7acbd20a7a..573a1c1206 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/WeaponItemsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/WeaponItemsME.java
@@ -1152,6 +1152,6 @@ private static Item registerItem(Item item, String name){
}
public static void registerModItems() {
- MiddleEarth.LOGGER.logDebugMsg("Registering Mod Weapon Items for " + MiddleEarth.MOD_ID);
+ MiddleEarth.logRegistryMsg("Weapon Items");
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArmorTierDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArmorTierDataComponent.java
index 4aec7bdcbc..a6a4502afb 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArmorTierDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArmorTierDataComponent.java
@@ -4,20 +4,14 @@
import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.netty.buffer.ByteBuf;
import net.minecraft.component.ComponentsAccess;
-import net.minecraft.component.type.DyedColorComponent;
import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
import net.minecraft.item.tooltip.TooltipAppender;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.text.Text;
-import net.minecraft.util.StringIdentifiable;
-import net.minecraft.util.math.ColorHelper;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
-import net.sevenstars.middleearth.item.DataComponentTypesME;
import net.sevenstars.middleearth.item.utils.armor.ArmorMaterialsME;
-import net.sevenstars.middleearth.item.utils.armor.backAttachments.BackAttachmentsME;
import java.util.function.Consumer;
@@ -39,7 +33,9 @@ public ArmorTierDataComponent(ArmorMaterialsME.Tiers tier){
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
- textConsumer.accept(Text.translatable("tooltip.%s.%s".formatted(MiddleEarth.MOD_ID, tier.getName())).withColor(tier.getColor()));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, tier.getName())
+ ).withColor(tier.getColor()));
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArtisanDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArtisanDataComponent.java
index 63b3f8bddc..f21c3d9b45 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArtisanDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/ArtisanDataComponent.java
@@ -10,14 +10,11 @@
import net.minecraft.item.tooltip.TooltipAppender;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Uuids;
-import net.minecraft.util.dynamic.Codecs;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
-import net.sevenstars.middleearth.item.utils.armor.backAttachments.BackAttachmentsME;
-import net.sevenstars.middleearth.resources.datas.factions.Faction;
import java.util.Optional;
import java.util.UUID;
@@ -41,7 +38,9 @@ public void appendTooltip(Item.TooltipContext context, Consumer textConsum
try {
if (profile.get().isPresent()){
try {
- textConsumer.accept(Text.translatable("tooltip.%s.artisan".formatted(MiddleEarth.MOD_ID)).append(
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "artisan")
+ ).append(
profile.get().get().getName()).formatted(Formatting.GRAY));
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BackAttachmentDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BackAttachmentDataComponent.java
index 684d19eedd..761e8a1937 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BackAttachmentDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BackAttachmentDataComponent.java
@@ -10,6 +10,7 @@
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.item.DataComponentTypesME;
import net.sevenstars.middleearth.item.utils.armor.DyeablePiecesME;
@@ -77,6 +78,8 @@ public int backAttachmentColor() {
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
- textConsumer.accept(Text.translatable("tooltip.%s.%s".formatted(MiddleEarth.MOD_ID, this.backAttachment().getName())).formatted(Formatting.GRAY));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, this.backAttachment().getName())
+ ).formatted(Formatting.GRAY));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BlockAuthorDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BlockAuthorDataComponent.java
index 8e3abbaaa8..d2d36e8e34 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BlockAuthorDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/BlockAuthorDataComponent.java
@@ -9,6 +9,7 @@
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.text.Text;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.utils.BlockAuthor;
@@ -29,6 +30,8 @@ public BlockAuthor author() {
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
- textConsumer.accept(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".author").append(this.author.getAuthorName()));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "author")
+ ).append(this.author.getAuthorName()));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/FactionDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/FactionDataComponent.java
index cc08682536..0a0875cba5 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/FactionDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/FactionDataComponent.java
@@ -12,6 +12,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.exceptions.FactionIdentifierException;
import net.sevenstars.middleearth.registries.DynamicRegistriesME;
@@ -56,12 +57,16 @@ public void appendTooltip(Item.TooltipContext context, Consumer textConsum
}
private void appendFaction(Consumer textConsumer, Faction faction){
- textConsumer.accept(Text.translatable("tooltip.%s.faction".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.GOLD)
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "faction")
+ ).formatted(Formatting.GOLD)
.append(Text.translatable(faction.getId().toTranslationKey("faction")).formatted(Formatting.WHITE)));
}
private void appendSubfaction(Consumer textConsumer, Faction faction){
- textConsumer.accept(Text.translatable("tooltip.%s.sub_faction".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.GRAY)
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "sub_faction")
+ ).formatted(Formatting.GRAY)
.append(Text.translatable(faction.getId().toTranslationKey("faction")).formatted(Formatting.WHITE)));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/HelmetAttachmentDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/HelmetAttachmentDataComponent.java
index 74c3a4181f..2672702c2e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/HelmetAttachmentDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/HelmetAttachmentDataComponent.java
@@ -10,6 +10,7 @@
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.item.DataComponentTypesME;
import net.sevenstars.middleearth.item.utils.armor.DyeablePiecesME;
@@ -87,6 +88,8 @@ public int helmetAttachmentColor() {
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
- textConsumer.accept(Text.translatable("tooltip.%s.%s".formatted(MiddleEarth.MOD_ID, this.helmetAttachment().getName())).formatted(Formatting.GRAY));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, this.helmetAttachment().getName())
+ ).formatted(Formatting.GRAY));
}
}
\ No newline at end of file
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/RaceDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/RaceDataComponent.java
index df7acc4b83..317191e588 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/RaceDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/RaceDataComponent.java
@@ -12,6 +12,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.registries.DynamicRegistriesME;
import net.sevenstars.middleearth.resources.datas.races.Race;
@@ -31,7 +32,9 @@ public record RaceDataComponent(Identifier raceId) implements TooltipAppender {
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
Race race = context.getRegistryLookup().getOrThrow(DynamicRegistriesME.RACE).getOrThrow(RegistryKey.of(DynamicRegistriesME.RACE, this.raceId)).value();
- textConsumer.accept(Text.translatable("tooltip.%s.race".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.DARK_RED)
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "race")
+ ).formatted(Formatting.DARK_RED)
.append(Text.translatable(race.getId().toTranslationKey("race")).formatted(Formatting.WHITE)));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/SeasonDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/SeasonDataComponent.java
index e4b00cbdeb..bbb052ffef 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/SeasonDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/SeasonDataComponent.java
@@ -13,6 +13,7 @@
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
import net.minecraft.util.StringIdentifiable;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.exceptions.FactionIdentifierException;
import net.sevenstars.middleearth.utils.ColorsME;
@@ -33,8 +34,12 @@ public record SeasonDataComponent(Season season) implements TooltipAppender {
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
try{
Identifier identifier = context.getRegistryLookup().getOrThrow(RegistryKeys.BIOME).getKey().getRegistry();
- textConsumer.accept(Text.translatable("tooltip.%s.season".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.GOLD)
- .append(Text.translatable("season.%s.".formatted(MiddleEarth.MOD_ID) + season.toString()).formatted(Formatting.WHITE)));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "season")
+ ).formatted(Formatting.GOLD)
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.SEASON, season.toString())
+ ).formatted(Formatting.WHITE)));
} catch (Exception e){
textConsumer.accept(Text.translatable(FactionIdentifierException.KEY, this.season)
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/TemperatureDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/TemperatureDataComponent.java
index 9cf79be6b8..f120a8ecbd 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/TemperatureDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/TemperatureDataComponent.java
@@ -4,6 +4,7 @@
import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.netty.buffer.ByteBuf;
import net.minecraft.component.ComponentsAccess;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.utils.ColorsME;
import net.minecraft.item.Item;
@@ -30,10 +31,20 @@ public int temperature() {
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
- if (this.temperature >= 80) textConsumer.accept(Text.translatable("tooltip.%s.temp_5".formatted(MiddleEarth.MOD_ID)).withColor(ColorsME.TEMP_5.color));
- if (this.temperature < 80 && this.temperature >= 60) textConsumer.accept(Text.translatable("tooltip.%s.temp_4".formatted(MiddleEarth.MOD_ID)).withColor(ColorsME.TEMP_4.color));
- if (this.temperature < 60 && this.temperature >= 40) textConsumer.accept(Text.translatable("tooltip.%s.temp_3".formatted(MiddleEarth.MOD_ID)).withColor(ColorsME.TEMP_3.color));
- if (this.temperature < 40 && this.temperature >= 20) textConsumer.accept(Text.translatable("tooltip.%s.temp_2".formatted(MiddleEarth.MOD_ID)).withColor(ColorsME.TEMP_2.color));
- if (this.temperature < 20 && this.temperature >= 0) textConsumer.accept(Text.translatable("tooltip.%s.temp_1".formatted(MiddleEarth.MOD_ID)).withColor(ColorsME.TEMP_1.color));
+ if (this.temperature >= 80) textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "temp_5")
+ ).withColor(ColorsME.TEMP_5.color));
+ if (this.temperature < 80 && this.temperature >= 60) textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "temp_4")
+ ).withColor(ColorsME.TEMP_4.color));
+ if (this.temperature < 60 && this.temperature >= 40) textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "temp_3")
+ ).withColor(ColorsME.TEMP_3.color));
+ if (this.temperature < 40 && this.temperature >= 20) textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "temp_2")
+ ).withColor(ColorsME.TEMP_2.color));
+ if (this.temperature < 20 && this.temperature >= 0) textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "temp_1")
+ ).withColor(ColorsME.TEMP_1.color));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/WeaponTypeDataComponent.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/WeaponTypeDataComponent.java
index 0bcb254892..9d7e78a699 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/WeaponTypeDataComponent.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/dataComponents/WeaponTypeDataComponent.java
@@ -11,6 +11,7 @@
import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.item.utils.armor.ArmorMaterialsME;
@@ -28,8 +29,12 @@ public record WeaponTypeDataComponent(String type) implements TooltipAppender {
@Override
public void appendTooltip(Item.TooltipContext context, Consumer textConsumer, TooltipType type, ComponentsAccess components) {
- textConsumer.accept(Text.translatable("tooltip.%s.type".formatted(MiddleEarth.MOD_ID)).formatted(Formatting.GOLD)
- .append(Text.translatable("tooltip.%s.%s".formatted(MiddleEarth.MOD_ID, this.type)).formatted(Formatting.WHITE)));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "type")
+ ).formatted(Formatting.GOLD)
+ .append(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, this.type)
+ ).formatted(Formatting.WHITE)));
}
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/DoorBlockItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/DoorBlockItem.java
index a86f30b489..86f7d8fae9 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/DoorBlockItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/DoorBlockItem.java
@@ -1,6 +1,7 @@
package net.sevenstars.middleearth.item.items;
import net.minecraft.component.type.TooltipDisplayComponent;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.special.LargeDoorBlock;
import net.minecraft.item.BlockItem;
@@ -21,7 +22,9 @@ public DoorBlockItem(LargeDoorBlock block, Settings settings) {
@Override
public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) {
- textConsumer.accept(Text.translatable("tooltip." + MiddleEarth.MOD_ID + ".door_size").append(block.getDoorWidth() + "x" + block.getDoorHeight()));
+ textConsumer.accept(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, "door_size")
+ ).append(block.getDoorWidth() + "x" + block.getDoorHeight()));
super.appendTooltip(stack, context, displayComponent, textConsumer, type);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/CustomHelmetItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/CustomHelmetItem.java
index 99d1718491..467433555f 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/CustomHelmetItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/CustomHelmetItem.java
@@ -4,6 +4,7 @@
import net.minecraft.item.equipment.EquipmentType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.item.DataComponentTypesME;
import net.sevenstars.middleearth.item.dataComponents.HelmetAttachmentDataComponent;
@@ -20,10 +21,14 @@ public static void toggleHoodState(ServerPlayerEntity player, ItemStack stack){
if (hoodDataComponent != null){
if (hoodDataComponent.down() && hoodDataComponent.getHelmetAttachment().getConstantState() == null) {
stack.set(DataComponentTypesME.HELMET_ATTACHMENT_DATA, new HelmetAttachmentDataComponent(false, hoodDataComponent.helmetAttachment(), hoodDataComponent.helmetAttachmentColor()));
- player.sendMessage(Text.translatable("alert." + MiddleEarth.MOD_ID + ".hood_up"), true);
+ player.sendMessage(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ALERT, "hood_up")
+ ), true);
} else if (!hoodDataComponent.down() && hoodDataComponent.getHelmetAttachment().getConstantState() == null){
stack.set(DataComponentTypesME.HELMET_ATTACHMENT_DATA, new HelmetAttachmentDataComponent(true, hoodDataComponent.helmetAttachment(), hoodDataComponent.helmetAttachmentColor()));
- player.sendMessage(Text.translatable("alert." + MiddleEarth.MOD_ID + ".hood_down"), true);
+ player.sendMessage(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ALERT, "hood_down")
+ ), true);
}
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/HelmetAttachmentItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/HelmetAttachmentItem.java
index a331500f15..a6b51e85dd 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/HelmetAttachmentItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/HelmetAttachmentItem.java
@@ -5,6 +5,7 @@
import net.minecraft.item.equipment.EquipmentType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.item.DataComponentTypesME;
import net.sevenstars.middleearth.item.dataComponents.HelmetAttachmentDataComponent;
@@ -21,10 +22,14 @@ public static void toggleHelmetAttachmentState(ServerPlayerEntity player, ItemSt
if (helmetAttachmentDataComponent != null){
if (helmetAttachmentDataComponent.down() && helmetAttachmentDataComponent.getHelmetAttachment().getConstantState() == null) {
stack.set(DataComponentTypesME.HELMET_ATTACHMENT_DATA, new HelmetAttachmentDataComponent(false, helmetAttachmentDataComponent.helmetAttachment(), helmetAttachmentDataComponent.helmetAttachmentColor()));
- player.sendMessage(Text.translatable("alert." + MiddleEarth.MOD_ID + ".hood_up"), true);
+ player.sendMessage(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ALERT, "hood_up")
+ ), true);
} else if (!helmetAttachmentDataComponent.down() && helmetAttachmentDataComponent.getHelmetAttachment().getConstantState() == null){
stack.set(DataComponentTypesME.HELMET_ATTACHMENT_DATA, new HelmetAttachmentDataComponent(true, helmetAttachmentDataComponent.helmetAttachment(), helmetAttachmentDataComponent.helmetAttachmentColor()));
- player.sendMessage(Text.translatable("alert." + MiddleEarth.MOD_ID + ".hood_down"), true);
+ player.sendMessage(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ALERT, "hood_down")
+ ), true);
}
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/WoodlandRealmCrownItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/WoodlandRealmCrownItem.java
index 10eb8aa7fe..2b47815823 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/WoodlandRealmCrownItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/armor/WoodlandRealmCrownItem.java
@@ -81,7 +81,7 @@ public void inventoryTick(ItemStack stack, ServerWorld world, Entity entity, @Nu
if(newSeason != SeasonDataComponent.Season.DEAD) {
itemModelName += "_" + newSeason;
}
- Identifier newItemModel = Identifier.of(MiddleEarth.MOD_ID, itemModelName.toLowerCase());
+ Identifier newItemModel = MiddleEarth.id(itemModelName.toLowerCase());
stack.set(DataComponentTypes.ITEM_MODEL, newItemModel);
stack.set(DataComponentTypesME.SEASON_DATA, new SeasonDataComponent(newSeason));
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/CustomDaggerWeaponItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/CustomDaggerWeaponItem.java
index 494d57d4eb..2da0c56dc1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/CustomDaggerWeaponItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/CustomDaggerWeaponItem.java
@@ -20,7 +20,7 @@
import org.joml.Vector3f;
public class CustomDaggerWeaponItem extends ReachWeaponItem {
- public static final Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = Identifier.of(MiddleEarth.MOD_ID, "entity_interaction_range");
+ public static final Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = MiddleEarth.id("entity_interaction_range");
private static final int SNEAK_ATTACK_TIME = 40;
public CustomDaggerWeaponItem(ToolMaterial toolMaterial, Item.Settings settings) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/ReachWeaponItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/ReachWeaponItem.java
index 9aaea4f279..b6fcf811f8 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/ReachWeaponItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/ReachWeaponItem.java
@@ -19,7 +19,7 @@
public class ReachWeaponItem extends Item {
- public static final Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = Identifier.of(MiddleEarth.MOD_ID, "entity_interaction_range");
+ public static final Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = MiddleEarth.id("entity_interaction_range");
public WeaponTypesME type;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/artefacts/ArtefactCustomGlowingLongswordWeaponItem.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/artefacts/ArtefactCustomGlowingLongswordWeaponItem.java
index eff731bfcc..8f20b9f154 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/artefacts/ArtefactCustomGlowingLongswordWeaponItem.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/artefacts/ArtefactCustomGlowingLongswordWeaponItem.java
@@ -24,7 +24,7 @@
import org.jetbrains.annotations.Nullable;
public class ArtefactCustomGlowingLongswordWeaponItem extends CustomLongswordWeaponItem {
- public static final Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = Identifier.of(MiddleEarth.MOD_ID, "entity_interaction_range");
+ public static final Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = MiddleEarth.id("entity_interaction_range");
public boolean glowing;
public int counter = 0;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/utils/ArtefactUtils.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/utils/ArtefactUtils.java
index c972ecc6e5..303431058d 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/utils/ArtefactUtils.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/items/weapons/utils/ArtefactUtils.java
@@ -5,6 +5,7 @@
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.world.World;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import java.util.List;
@@ -17,8 +18,12 @@ public static boolean isInBound(World world, Entity entity, C
public static LoreComponent getArtefactLore(String item){
return new LoreComponent(List.of(
- Text.translatable("tooltip.%s.%s_lore_0".formatted(MiddleEarth.MOD_ID, item)).formatted(Formatting.GRAY),
- Text.translatable("tooltip.%s.%s_lore_1".formatted(MiddleEarth.MOD_ID, item)).formatted(Formatting.GRAY)
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, item + "_lore_0")
+ ).formatted(Formatting.GRAY),
+ Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.TOOLTIP, item + "_lore_1")
+ ).formatted(Formatting.GRAY)
));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternTagsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternTagsME.java
index e69ed0b9e5..d9a05b700e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternTagsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternTagsME.java
@@ -32,6 +32,6 @@ public class BannerPatternTagsME {
public static final TagKey OAK_LEAF_PATTERN_ITEM = of("oak_leaf");
private static TagKey of(String name) {
- return TagKey.of(RegistryKeys.BANNER_PATTERN, Identifier.of(MiddleEarth.MOD_ID, "pattern_item/" + name));
+ return TagKey.of(RegistryKeys.BANNER_PATTERN, MiddleEarth.id("pattern_item/" + name));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternsME.java
index 0e9e7d3744..693a3010d9 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/BannerPatternsME.java
@@ -1,5 +1,6 @@
package net.sevenstars.middleearth.item.utils;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.minecraft.block.entity.BannerPattern;
import net.minecraft.registry.Registerable;
@@ -69,7 +70,7 @@ public class BannerPatternsME {
private static RegistryKey key(String id) {
TranslationEntries.bannerPatternEntries.add(id);
- return RegistryKey.of(RegistryKeys.BANNER_PATTERN, Identifier.of(MiddleEarth.MOD_ID, id));
+ return RegistryKey.of(RegistryKeys.BANNER_PATTERN, MiddleEarth.id(id));
}
public static void register(Registerable registry) {
@@ -132,6 +133,8 @@ public static void register(Registerable registry) {
}
public static void register(Registerable registry, RegistryKey key) {
- registry.register(key, new BannerPattern(key.getValue(), "block.%s.banner.".formatted(MiddleEarth.MOD_ID) + key.getValue().toShortTranslationKey()));
+ registry.register(key, new BannerPattern(key.getValue(),
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.BLOCK, "banner." + key.getValue().toShortTranslationKey())
+ ));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemGroupsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemGroupsME.java
index 245a1dae4b..3356c7e7cb 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemGroupsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemGroupsME.java
@@ -5,6 +5,7 @@
import net.minecraft.item.ItemStack;
import net.minecraft.registry.*;
import net.minecraft.text.Text;
+import net.sevenstars.api.enums.LangCategory;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.block.registration.GenericBlockSetRegistryME;
import net.sevenstars.middleearth.block.registration.NatureBlockRegistryME;
@@ -41,7 +42,9 @@ public class ItemGroupsME {
public static final List MISC_BLOCKS_CONTENTS = new LinkedList<>();
public static final ItemGroup MISC_BLOCKS = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".misc_blocks"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "misc_blocks")
+ ))
.icon(() -> new ItemStack(GenericBlockSetRegistryME.STRAW.blockSet.base().asItem()))
.entries((displayContext, entries) -> {
for (ItemStack item : MISC_BLOCKS_CONTENTS) {
@@ -52,7 +55,9 @@ public class ItemGroupsME {
public static final List DECORATIVES_BLOCKS_CONTENT = new LinkedList<>();
public static final ItemGroup DECORATIVES_BLOCKS = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".decorative_blocks"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "decorative_blocks")
+ ))
.icon(() -> new ItemStack(DecorativeItemsME.DWARVEN_LANTERN))
.entries((displayContext, entries) -> {
for (ItemStack item : DECORATIVES_BLOCKS_CONTENT) {
@@ -64,7 +69,9 @@ public class ItemGroupsME {
public static final List NATURE_BLOCKS_CONTENTS = new LinkedList<>();
public static final ItemGroup NATURE_BLOCKS = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".nature_blocks"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "nature_blocks")
+ ))
.icon(() -> new ItemStack(NatureBlockRegistryME.HEATHER.asItem()))
.entries((displayContext, entries) -> {
for (ItemStack item : NATURE_BLOCKS_CONTENTS) {
@@ -75,7 +82,9 @@ public class ItemGroupsME {
public static final List FOOD_CONTENTS = new LinkedList<>();
public static final ItemGroup FOOD = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".food_items"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "food_items")
+ ))
.icon(() -> new ItemStack(FoodItemsME.LEMBAS))
.entries((displayContext, entries) -> {
for (ItemStack item : FOOD_CONTENTS) {
@@ -86,7 +95,9 @@ public class ItemGroupsME {
public static final List WEAPONS_CONTENTS = new LinkedList<>();
public static final ItemGroup WEAPONS = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".weapon_items"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "weapon_items")
+ ))
.icon(() -> new ItemStack(WeaponItemsME.GONDORIAN_SWORD))
.entries((displayContext, entries) -> {
for (ItemStack item : WEAPONS_CONTENTS) {
@@ -97,7 +108,9 @@ public class ItemGroupsME {
public static final List EQUIPMENT_CONTENTS = new LinkedList<>();
public static final ItemGroup EQUIPMENT = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".equipment_items"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "equipment_items")
+ ))
.icon(() -> new ItemStack(EquipmentItemsME.GONDORIAN_FOUNTAIN_GUARD_HELMET))
.entries((displayContext, entries) -> {
for (ItemStack item : EQUIPMENT_CONTENTS) {
@@ -108,7 +121,9 @@ public class ItemGroupsME {
public static final List TOOLS_CONTENTS = new LinkedList<>();
public static final ItemGroup TOOLS = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".tool_items"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "tool_items")
+ ))
.icon(() -> new ItemStack(ToolItemsME.KHAZAD_STEEL_PICKAXE))
.entries((displayContext, entries) -> {
for (ItemStack item : TOOLS_CONTENTS) {
@@ -119,7 +134,9 @@ public class ItemGroupsME {
public static final List RESOURCES_CONTENTS = new LinkedList<>();
public static final ItemGroup RESOURCES = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".resource_items"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "resource_items")
+ ))
.icon(() -> new ItemStack(ResourceItemsME.MITHRIL_INGOT))
.entries((displayContext, entries) -> {
for (ItemStack item : RESOURCES_CONTENTS) {
@@ -130,7 +147,9 @@ public class ItemGroupsME {
public static final List SPAWN_EGGS_CONTENTS = new LinkedList<>();
public static final ItemGroup SPAWN_EGGS = FabricItemGroup.builder()
- .displayName(Text.translatable("itemGroup." + MiddleEarth.MOD_ID + ".spawn_egg_items"))
+ .displayName(Text.translatable(
+ MiddleEarth.rawTranslationKeyWithModId(LangCategory.ITEM_GROUP, "spawn_egg_items")
+ ))
.icon(() -> new ItemStack(EggItemsME.BROADHOOF_GOAT_SPAWN_EGG))
.entries((displayContext, entries) -> {
for (ItemStack item : SPAWN_EGGS_CONTENTS) {
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemSettingsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemSettingsME.java
index 598df088bd..1d97859db8 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemSettingsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/ItemSettingsME.java
@@ -31,7 +31,7 @@ public interface ItemSettingsME {
* Middle-earth mod custom Settings for weapons
*/
- Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = Identifier.of(MiddleEarth.MOD_ID, "entity_interaction_range");
+ Identifier ENTITY_INTERACTION_RANGE_MODIFIER_ID = MiddleEarth.id("entity_interaction_range");
static Item.Settings createWeaponSettings(ToolMaterial material, Item.Settings settings, WeaponTypesME type){
RegistryEntryLookup registryEntryLookup = Registries.createEntryLookup(Registries.BLOCK);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimMaterialsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimMaterialsME.java
index 5048074ee7..46182b96b1 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimMaterialsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimMaterialsME.java
@@ -46,6 +46,6 @@ private static void register(Registerable registry, RegistryK
}
private static RegistryKey of(String id) {
- return RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(MiddleEarth.MOD_ID, id));
+ return RegistryKey.of(RegistryKeys.TRIM_MATERIAL, MiddleEarth.id(id));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimPatternsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimPatternsME.java
index c06fddd1b2..bf80cbbeba 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimPatternsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/SmithingTrimPatternsME.java
@@ -20,6 +20,6 @@ public static void register(Registerable registry, RegistryKey
}
private static RegistryKey of(String id) {
- return RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(MiddleEarth.MOD_ID, id));
+ return RegistryKey.of(RegistryKeys.TRIM_PATTERN, MiddleEarth.id(id));
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/armor/ArmorMaterialsME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/armor/ArmorMaterialsME.java
index 63ba357eaa..924ecac7a4 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/armor/ArmorMaterialsME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/item/utils/armor/ArmorMaterialsME.java
@@ -187,7 +187,7 @@ private static ExtendedArmorMaterial register(String name, EnumMap cir, @Local BlockState blockState) {
- if (floor.isIn(BlockTagsME.FARMLANDS) || floor.isIn(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "farmlands")))){
+ if (floor.isIn(BlockTagsME.FARMLANDS) || floor.isIn(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("farmlands")))){
cir.setReturnValue(true);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/EntityDataSaverMixin.java b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/EntityDataSaverMixin.java
index 49fac72dd5..253c4c15c0 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/EntityDataSaverMixin.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/EntityDataSaverMixin.java
@@ -1,19 +1,14 @@
package net.sevenstars.middleearth.mixin;
-import net.minecraft.storage.ReadView;
-import net.minecraft.storage.WriteView;
import net.sevenstars.middleearth.MiddleEarth;
import net.sevenstars.middleearth.utils.IEntityDataSaver;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.NbtCompound;
import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(PlayerEntity.class)
public class EntityDataSaverMixin implements IEntityDataSaver {
- private final String KEY = MiddleEarth.MOD_ID;
+ private final String KEY = MiddleEarth.getModId(); // FIXME: might be a better way
private NbtCompound persistentData;
@Override
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/PowderSnowBlockMixin.java b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/PowderSnowBlockMixin.java
index 0133c6b798..c662a08822 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/PowderSnowBlockMixin.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/PowderSnowBlockMixin.java
@@ -23,7 +23,7 @@ public class PowderSnowBlockMixin {
@WrapOperation(method = "canWalkOnPowderSnow", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z", ordinal = 0))
private static boolean canWalkOnPowderSnowTag(ItemStack instance, Item item, Operation original) {
- return original.call(instance, item) || instance.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "powder_snow_walk_on")));
+ return original.call(instance, item) || instance.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("powder_snow_walk_on")));
}
@Inject(method = "canWalkOnPowderSnow", at = @At("HEAD"), cancellable = true)
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/RepairItemRecipeMixin.java b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/RepairItemRecipeMixin.java
index 6f3965c7ba..60af1b700c 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/RepairItemRecipeMixin.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/RepairItemRecipeMixin.java
@@ -27,8 +27,8 @@ private static void canCombineStacks(ItemStack first, ItemStack second, Callback
&& first.contains(DataComponentTypes.DAMAGE)
&& second.contains(DataComponentTypes.DAMAGE)
- && !first.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "anvil_items")))
- && !second.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MiddleEarth.MOD_ID, "anvil_items")))
+ && !first.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("anvil_items")))
+ && !second.isIn(TagKey.of(RegistryKeys.ITEM, MiddleEarth.id("anvil_items")))
);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/ShearItemMixin.java b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/ShearItemMixin.java
index e75ce5118f..c2801017c0 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/ShearItemMixin.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/ShearItemMixin.java
@@ -32,7 +32,7 @@ private static void createToolComponent(CallbackInfoReturnable ci
RegistryEntryLookup registryEntryLookup = Registries.createEntryLookup(Registries.BLOCK);
cir.setReturnValue(new ToolComponent(List.of(
ToolComponent.Rule.ofAlwaysDropping(
- registryEntryLookup.getOrThrow(TagKey.of(RegistryKeys.BLOCK, Identifier.of(MiddleEarth.MOD_ID, "cobwebs"))), 15.0F),
+ registryEntryLookup.getOrThrow(TagKey.of(RegistryKeys.BLOCK, MiddleEarth.id("cobwebs"))), 15.0F),
ToolComponent.Rule.of(registryEntryLookup.getOrThrow(BlockTags.LEAVES), 15.0F),
ToolComponent.Rule.of(registryEntryLookup.getOrThrow(BlockTags.WOOL), 5.0F),
ToolComponent.Rule.of(RegistryEntryList.of(Blocks.VINE.getRegistryEntry(), Blocks.GLOW_LICHEN.getRegistryEntry()), 2.0F)), 1.0F, 1, false));
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/client/InGameHudMixin.java b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/client/InGameHudMixin.java
index 20fccf8a69..7a8777ff37 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/client/InGameHudMixin.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/mixin/client/InGameHudMixin.java
@@ -16,7 +16,7 @@
@Mixin(InGameHud.class)
public abstract class InGameHudMixin {
@Unique
- private static final Identifier HALLUCINATION_OUTLINE = Identifier.of(MiddleEarth.MOD_ID, "textures/misc/hallucination_outline.png");
+ private static final Identifier HALLUCINATION_OUTLINE = MiddleEarth.id("textures/misc/hallucination_outline.png");
@Shadow @Final private MinecraftClient client;
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/HoodStateTogglePacket.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/HoodStateTogglePacket.java
index 02b9471438..7e5a853eff 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/HoodStateTogglePacket.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/HoodStateTogglePacket.java
@@ -15,7 +15,7 @@
import java.util.Objects;
public class HoodStateTogglePacket extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "hood_state_toggle_packet"));
+ public static final Id ID = new Id<>(MiddleEarth.id("hood_state_toggle_packet"));
public static final HoodStateTogglePacket INSTANCE = new HoodStateTogglePacket();
public static final PacketCodec CODEC = PacketCodec.unit(INSTANCE);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketOnboardingRequest.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketOnboardingRequest.java
index d8f92853c6..f7b3774b67 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketOnboardingRequest.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketOnboardingRequest.java
@@ -15,7 +15,7 @@
public class PacketOnboardingRequest extends ClientToServerPacket
{
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_onboarding_request"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_onboarding_request"));
public static final PacketOnboardingRequest INSTANCE = new PacketOnboardingRequest();
public static final PacketCodec CODEC = PacketCodec.unit(INSTANCE);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetAffiliation.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetAffiliation.java
index 4190479b1e..3c095494ac 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetAffiliation.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetAffiliation.java
@@ -16,7 +16,7 @@
public class PacketSetAffiliation extends ClientToServerPacket
{
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_set_affiliation"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_set_affiliation"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.STRING, p -> p.dispositionName,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetRace.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetRace.java
index 77c7054b82..e9de9869d9 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetRace.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetRace.java
@@ -13,7 +13,7 @@
public class PacketSetRace extends ClientToServerPacket
{
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_set_race"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_set_race"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.STRING, p -> p.race,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetSpawnData.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetSpawnData.java
index cc163dfe48..849f91adaf 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetSpawnData.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketSetSpawnData.java
@@ -15,7 +15,7 @@
public class PacketSetSpawnData extends ClientToServerPacket
{
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_spawn_data"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_spawn_data"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.INTEGER, p -> p.overworldX,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerRespawnEntities.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerRespawnEntities.java
index 5aeeb32668..7608f00279 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerRespawnEntities.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerRespawnEntities.java
@@ -11,7 +11,7 @@
import net.sevenstars.api.network.packets.ClientToServerPacket;
public class PacketStructureManagerRespawnEntities extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "structure_manager_respawn_entities"));
+ public static final Id ID = new Id<>(MiddleEarth.id("structure_manager_respawn_entities"));
public static final PacketCodec CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, p -> p.pos,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerShowAllEntities.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerShowAllEntities.java
index d8605dcf57..1b6a0f106c 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerShowAllEntities.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerShowAllEntities.java
@@ -12,7 +12,7 @@
import net.sevenstars.api.network.packets.ClientToServerPacket;
public class PacketStructureManagerShowAllEntities extends ClientToServerPacket {
- public static final CustomPayload.Id ID = new CustomPayload.Id<>(Identifier.of(MiddleEarth.MOD_ID, "structure_manager_show_all_entities"));
+ public static final CustomPayload.Id ID = new CustomPayload.Id<>(MiddleEarth.id("structure_manager_show_all_entities"));
public static final PacketCodec CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, p -> p.pos,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerUpdateBlockEntityRequest.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerUpdateBlockEntityRequest.java
index dbf7f8fce3..8769d69353 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerUpdateBlockEntityRequest.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureManagerUpdateBlockEntityRequest.java
@@ -13,7 +13,7 @@
public class PacketStructureManagerUpdateBlockEntityRequest extends ClientToServerPacket
{
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "structure_manager_update_block_entity_request"));
+ public static final Id ID = new Id<>(MiddleEarth.id("structure_manager_update_block_entity_request"));
public static final PacketCodec CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, p -> p.pos,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureNestUpdateBlockEntityRequest.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureNestUpdateBlockEntityRequest.java
index 4492ecded9..a5fff019e6 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureNestUpdateBlockEntityRequest.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketStructureNestUpdateBlockEntityRequest.java
@@ -15,7 +15,7 @@
public class PacketStructureNestUpdateBlockEntityRequest extends ClientToServerPacket
{
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "structure_nest_update_block_entity_request"));
+ public static final Id ID = new Id<>(MiddleEarth.id("structure_nest_update_block_entity_request"));
public static final PacketCodec CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, p -> p.pos,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentOverworldSpawn.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentOverworldSpawn.java
index de37167c38..6b69da37a5 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentOverworldSpawn.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentOverworldSpawn.java
@@ -14,7 +14,7 @@
public class PacketTeleportToCurrentOverworldSpawn extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_teleport_to_current_overworld_spawn"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_teleport_to_current_overworld_spawn"));
public static final PacketTeleportToCurrentOverworldSpawn INSTANCE = new PacketTeleportToCurrentOverworldSpawn();
public static final PacketCodec CODEC = PacketCodec.unit(INSTANCE);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentSpawn.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentSpawn.java
index 3748b017d4..a5385f4f27 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentSpawn.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCurrentSpawn.java
@@ -14,7 +14,7 @@
public class PacketTeleportToCurrentSpawn extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_teleport_current_spawn"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_teleport_current_spawn"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.BOOLEAN, p -> p.welcomeNeeded,
PacketTeleportToCurrentSpawn::new
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCustomCoordinate.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCustomCoordinate.java
index 36f420b773..036db6164e 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCustomCoordinate.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToCustomCoordinate.java
@@ -11,7 +11,7 @@
import net.minecraft.util.math.Vec3d;
public class PacketTeleportToCustomCoordinate extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_teleport_custom_spawn"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_teleport_custom_spawn"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.DOUBLE, p -> p.xCoordinate,
PacketCodecs.DOUBLE, p -> p.yCoordinate,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicCoordinate.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicCoordinate.java
index 9ffe5df467..59e0d8c4bf 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicCoordinate.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicCoordinate.java
@@ -14,7 +14,7 @@
import org.joml.Vector2d;
public class PacketTeleportToDynamicCoordinate extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_teleport_dynamic_spawn"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_teleport_dynamic_spawn"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.DOUBLE, p -> p.xCoordinate,
PacketCodecs.DOUBLE, p -> p.zCoordinate,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicWorldCoordinate.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicWorldCoordinate.java
index d4f350fdc6..5e178662e8 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicWorldCoordinate.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/client2server/PacketTeleportToDynamicWorldCoordinate.java
@@ -12,7 +12,7 @@
import net.minecraft.util.math.Vec3d;
public class PacketTeleportToDynamicWorldCoordinate extends ClientToServerPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_teleport_dynamic_world_coordinate"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_teleport_dynamic_world_coordinate"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.DOUBLE, p -> p.xCoordinate,
PacketCodecs.DOUBLE, p -> p.zCoordinate,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketForceOnboardingScreen.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketForceOnboardingScreen.java
index b073d0a30e..51c5b01380 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketForceOnboardingScreen.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketForceOnboardingScreen.java
@@ -15,7 +15,7 @@
import net.sevenstars.middleearth.resources.datas.attributes.AttributePoolElement;
public class PacketForceOnboardingScreen extends ServerToClientPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_force_onboarding_screen"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_force_onboarding_screen"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.FLOAT, p -> p.delayOnTeleportationConfirm,
PacketCodecs.NBT_COMPOUND, p -> p.attributeList,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketLivingEntityData.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketLivingEntityData.java
index 3ae21f6e22..f54bf200fc 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketLivingEntityData.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketLivingEntityData.java
@@ -12,7 +12,7 @@
import net.sevenstars.api.network.packets.ServerToClientPacket;
public class PacketLivingEntityData extends ServerToClientPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_living_entity_data"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_living_entity_data"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.INTEGER, p -> p.entityId,
StatusEffectInstance.PACKET_CODEC, p -> p.statusEffectInstance,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketOnboardingResult.java b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketOnboardingResult.java
index 1c1600ec27..64f53c09ca 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketOnboardingResult.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/network/packets/server2client/PacketOnboardingResult.java
@@ -18,7 +18,7 @@
import net.minecraft.util.Identifier;
public class PacketOnboardingResult extends ServerToClientPacket {
- public static final Id ID = new Id<>(Identifier.of(MiddleEarth.MOD_ID, "packet_onboarding_result"));
+ public static final Id ID = new Id<>(MiddleEarth.id("packet_onboarding_result"));
public static final PacketCodec CODEC = PacketCodec.tuple(
PacketCodecs.BOOLEAN, p -> p.havePlayerData,
PacketCodecs.BOOLEAN, p -> p.canChangeFaction,
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/particles/ParticleTypeRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/particles/ParticleTypeRegistryME.java
index bda2389f27..44e6e4dbad 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/particles/ParticleTypeRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/particles/ParticleTypeRegistryME.java
@@ -13,8 +13,8 @@ public class ParticleTypeRegistryME {
public static final SimpleParticleType BIOME_FOG_PARTICLE = FabricParticleTypes.simple(true);
public static void registerParticleTypes(){
- Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MiddleEarth.MOD_ID, "anvil_spark_particles"), ANVIL_SPARK_PARTICLE);
- Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MiddleEarth.MOD_ID, "biome_fog_particles"), BIOME_FOG_PARTICLE);
+ Registry.register(Registries.PARTICLE_TYPE, MiddleEarth.id("anvil_spark_particles"), ANVIL_SPARK_PARTICLE);
+ Registry.register(Registries.PARTICLE_TYPE, MiddleEarth.id("biome_fog_particles"), BIOME_FOG_PARTICLE);
}
}
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/BackAttachmentRemovalRecipe.java b/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/BackAttachmentRemovalRecipe.java
index f85ec44a90..ec4995a7bf 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/BackAttachmentRemovalRecipe.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/BackAttachmentRemovalRecipe.java
@@ -36,7 +36,7 @@ public DefaultedList getRecipeRemainders(CraftingRecipeInput input) {
} else if (itemStack.getItem() instanceof ShearsItem) {
defaultedList.set(i, itemStack.copyWithCount(1));
} else if (itemStack.get(DataComponentTypesME.BACK_ATTACHMENT_DATA) != null){
- ItemStack backAttachment = new ItemStack(Registries.ITEM.get(Identifier.of(MiddleEarth.MOD_ID, itemStack.get(DataComponentTypesME.BACK_ATTACHMENT_DATA).backAttachment().getName())));
+ ItemStack backAttachment = new ItemStack(Registries.ITEM.get(MiddleEarth.id(itemStack.get(DataComponentTypesME.BACK_ATTACHMENT_DATA).backAttachment().getName())));
backAttachment.set(DataComponentTypesME.BACK_ATTACHMENT_DATA, itemStack.get(DataComponentTypesME.BACK_ATTACHMENT_DATA));
backAttachment.set(DataComponentTypes.DYED_COLOR, new DyedColorComponent(itemStack.get(DataComponentTypesME.BACK_ATTACHMENT_DATA).backAttachmentColor()));
defaultedList.set(i, backAttachment);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/HelmetAttachmentRemovalRecipe.java b/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/HelmetAttachmentRemovalRecipe.java
index 215aa9cd50..a3dc32cf68 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/HelmetAttachmentRemovalRecipe.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/HelmetAttachmentRemovalRecipe.java
@@ -36,7 +36,7 @@ public DefaultedList getRecipeRemainders(CraftingRecipeInput input) {
} else if (itemStack.getItem() instanceof ShearsItem) {
defaultedList.set(i, itemStack.copyWithCount(1));
}else if (itemStack.get(DataComponentTypesME.HELMET_ATTACHMENT_DATA) != null){
- ItemStack helmetAttachment = new ItemStack(Registries.ITEM.get(Identifier.of(MiddleEarth.MOD_ID, itemStack.get(DataComponentTypesME.HELMET_ATTACHMENT_DATA).helmetAttachment().getName())));
+ ItemStack helmetAttachment = new ItemStack(Registries.ITEM.get(MiddleEarth.id(itemStack.get(DataComponentTypesME.HELMET_ATTACHMENT_DATA).helmetAttachment().getName())));
helmetAttachment.set(DataComponentTypesME.HELMET_ATTACHMENT_DATA, itemStack.get(DataComponentTypesME.HELMET_ATTACHMENT_DATA));
helmetAttachment.set(DataComponentTypes.DYED_COLOR, new DyedColorComponent(itemStack.get(DataComponentTypesME.HELMET_ATTACHMENT_DATA).helmetAttachmentColor()));
defaultedList.set(i, helmetAttachment);
diff --git a/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/RecipeSerializerRegistryME.java b/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/RecipeSerializerRegistryME.java
index d5622a4d2b..905621ec70 100644
--- a/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/RecipeSerializerRegistryME.java
+++ b/middle-earth/src/main/java/net/sevenstars/middleearth/recipe/RecipeSerializerRegistryME.java
@@ -22,10 +22,10 @@ public class RecipeSerializerRegistryME> {
public static final SpecialCraftingRecipe.SpecialRecipeSerializer CUSTOM_ITEM_DECORATION = register("custom_item_decoration", new SpecialCraftingRecipe.SpecialRecipeSerializer<>(CustomItemDecorationRecipe::new));
static