diff --git a/src/main/java/exopandora/worldhandler/gui/category/Category.java b/src/main/java/exopandora/worldhandler/gui/category/Category.java index d3ddc87..e4feaa9 100644 --- a/src/main/java/exopandora/worldhandler/gui/category/Category.java +++ b/src/main/java/exopandora/worldhandler/gui/category/Category.java @@ -13,7 +13,7 @@ import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.usercontent.UsercontentConfig; import exopandora.worldhandler.usercontent.UsercontentLoader; import exopandora.worldhandler.usercontent.model.JsonTab; -import exopandora.worldhandler.util.TranslationHelper; +import exopandora.worldhandler.util.RegistryHelper; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -91,13 +91,13 @@ public class Category { if(event.getRegistryKey().equals(REGISTRY_KEY)) { - TranslationHelper.register(event, REGISTRY_KEY, "main", () -> new Category("main", "containers", "multiplayer")); - TranslationHelper.register(event, REGISTRY_KEY, "entities", () -> new Category("summon", "butcher")); - TranslationHelper.register(event, REGISTRY_KEY, "items", () -> new Category("custom_item", "enchantment", "recipes")); - TranslationHelper.register(event, REGISTRY_KEY, "blocks", () -> new Category("edit_blocks", "sign_editor", "note_editor")); - TranslationHelper.register(event, REGISTRY_KEY, "world", () -> new Category("world", "gamerules", "locate")); - TranslationHelper.register(event, REGISTRY_KEY, "player", () -> new Category("player", "experience", "advancements")); - TranslationHelper.register(event, REGISTRY_KEY, "scoreboard", () -> new Category("scoreboard_objectives", "scoreboard_teams", "scoreboard_players")); + RegistryHelper.register(event, REGISTRY_KEY, "main", () -> new Category("main", "containers", "multiplayer")); + RegistryHelper.register(event, REGISTRY_KEY, "entities", () -> new Category("summon", "butcher")); + RegistryHelper.register(event, REGISTRY_KEY, "items", () -> new Category("custom_item", "enchantment", "recipes")); + RegistryHelper.register(event, REGISTRY_KEY, "blocks", () -> new Category("edit_blocks", "sign_editor", "note_editor")); + RegistryHelper.register(event, REGISTRY_KEY, "world", () -> new Category("world", "gamerules", "locate")); + RegistryHelper.register(event, REGISTRY_KEY, "player", () -> new Category("player", "experience", "advancements")); + RegistryHelper.register(event, REGISTRY_KEY, "scoreboard", () -> new Category("scoreboard_objectives", "scoreboard_teams", "scoreboard_players")); for(UsercontentConfig config : UsercontentLoader.CONFIGS) { @@ -115,7 +115,7 @@ public class Category { if(!Categories.isRegistered(tab.getCategory())) { - TranslationHelper.register(event, REGISTRY_KEY, tab.getCategory(), () -> new Category(id)); + RegistryHelper.register(event, REGISTRY_KEY, tab.getCategory(), () -> new Category(id)); } else { diff --git a/src/main/java/exopandora/worldhandler/gui/content/Content.java b/src/main/java/exopandora/worldhandler/gui/content/Content.java index 21275d3..61bc67b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/Content.java +++ b/src/main/java/exopandora/worldhandler/gui/content/Content.java @@ -34,7 +34,7 @@ import exopandora.worldhandler.gui.content.impl.ContentSummon; import exopandora.worldhandler.gui.content.impl.ContentUsercontent; import exopandora.worldhandler.gui.content.impl.ContentWorldInfo; import exopandora.worldhandler.usercontent.UsercontentLoader; -import exopandora.worldhandler.util.TranslationHelper; +import exopandora.worldhandler.util.RegistryHelper; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -64,54 +64,54 @@ public abstract class Content implements IContent if(event.getRegistryKey().equals(REGISTRY_KEY)) { //MAIN - TranslationHelper.register(event, REGISTRY_KEY, "main", () -> new ContentMain()); - TranslationHelper.register(event, REGISTRY_KEY, "containers", () -> new ContentContainers()); - TranslationHelper.register(event, REGISTRY_KEY, "multiplayer", () -> new ContentMultiplayer()); + RegistryHelper.register(event, REGISTRY_KEY, "main", () -> new ContentMain()); + RegistryHelper.register(event, REGISTRY_KEY, "containers", () -> new ContentContainers()); + RegistryHelper.register(event, REGISTRY_KEY, "multiplayer", () -> new ContentMultiplayer()); //ENTITIES - TranslationHelper.register(event, REGISTRY_KEY, "summon", () -> new ContentSummon()); - TranslationHelper.register(event, REGISTRY_KEY, "butcher", () -> new ContentButcher()); - TranslationHelper.register(event, REGISTRY_KEY, "butcher_settings", () -> new ContentButcherSettings()); - TranslationHelper.register(event, REGISTRY_KEY, "butcher_presets", () -> new ContentButcherPresets()); + RegistryHelper.register(event, REGISTRY_KEY, "summon", () -> new ContentSummon()); + RegistryHelper.register(event, REGISTRY_KEY, "butcher", () -> new ContentButcher()); + RegistryHelper.register(event, REGISTRY_KEY, "butcher_settings", () -> new ContentButcherSettings()); + RegistryHelper.register(event, REGISTRY_KEY, "butcher_presets", () -> new ContentButcherPresets()); //ITEMS - TranslationHelper.register(event, REGISTRY_KEY, "custom_item", () -> new ContentCustomItem()); - TranslationHelper.register(event, REGISTRY_KEY, "enchantment", () -> new ContentEnchantment()); - TranslationHelper.register(event, REGISTRY_KEY, "recipes", () -> new ContentRecipes()); + RegistryHelper.register(event, REGISTRY_KEY, "custom_item", () -> new ContentCustomItem()); + RegistryHelper.register(event, REGISTRY_KEY, "enchantment", () -> new ContentEnchantment()); + RegistryHelper.register(event, REGISTRY_KEY, "recipes", () -> new ContentRecipes()); //BLOCKS - TranslationHelper.register(event, REGISTRY_KEY, "edit_blocks", () -> new ContentEditBlocks()); - TranslationHelper.register(event, REGISTRY_KEY, "sign_editor", () -> new ContentSignEditor()); - TranslationHelper.register(event, REGISTRY_KEY, "note_editor", () -> new ContentNoteEditor()); + RegistryHelper.register(event, REGISTRY_KEY, "edit_blocks", () -> new ContentEditBlocks()); + RegistryHelper.register(event, REGISTRY_KEY, "sign_editor", () -> new ContentSignEditor()); + RegistryHelper.register(event, REGISTRY_KEY, "note_editor", () -> new ContentNoteEditor()); //WORLD - TranslationHelper.register(event, REGISTRY_KEY, "world", () -> new ContentWorldInfo()); - TranslationHelper.register(event, REGISTRY_KEY, "gamerules", () -> new ContentGamerules()); - TranslationHelper.register(event, REGISTRY_KEY, "locate", () -> new ContentLocate()); + RegistryHelper.register(event, REGISTRY_KEY, "world", () -> new ContentWorldInfo()); + RegistryHelper.register(event, REGISTRY_KEY, "gamerules", () -> new ContentGamerules()); + RegistryHelper.register(event, REGISTRY_KEY, "locate", () -> new ContentLocate()); //PLAYER - TranslationHelper.register(event, REGISTRY_KEY, "player", () -> new ContentPlayer()); - TranslationHelper.register(event, REGISTRY_KEY, "experience", () -> new ContentExperience()); - TranslationHelper.register(event, REGISTRY_KEY, "advancements", () -> new ContentAdvancements()); + RegistryHelper.register(event, REGISTRY_KEY, "player", () -> new ContentPlayer()); + RegistryHelper.register(event, REGISTRY_KEY, "experience", () -> new ContentExperience()); + RegistryHelper.register(event, REGISTRY_KEY, "advancements", () -> new ContentAdvancements()); //SCOREBOARD - TranslationHelper.register(event, REGISTRY_KEY, "scoreboard_objectives", () -> new ContentScoreboardObjectives()); - TranslationHelper.register(event, REGISTRY_KEY, "scoreboard_teams", () -> new ContentScoreboardTeams()); - TranslationHelper.register(event, REGISTRY_KEY, "scoreboard_players", () -> new ContentScoreboardPlayers()); + RegistryHelper.register(event, REGISTRY_KEY, "scoreboard_objectives", () -> new ContentScoreboardObjectives()); + RegistryHelper.register(event, REGISTRY_KEY, "scoreboard_teams", () -> new ContentScoreboardTeams()); + RegistryHelper.register(event, REGISTRY_KEY, "scoreboard_players", () -> new ContentScoreboardPlayers()); //MISC - TranslationHelper.register(event, REGISTRY_KEY, "change_world", () -> new ContentChangeWorld()); - TranslationHelper.register(event, REGISTRY_KEY, "continue", () -> new ContentContinue()); + RegistryHelper.register(event, REGISTRY_KEY, "change_world", () -> new ContentChangeWorld()); + RegistryHelper.register(event, REGISTRY_KEY, "continue", () -> new ContentContinue()); //NO CATEGORY - TranslationHelper.register(event, REGISTRY_KEY, "potions", () -> new ContentPotions()); - TranslationHelper.register(event, REGISTRY_KEY, "command_stack", () -> new ContentCommandStack()); - TranslationHelper.register(event, REGISTRY_KEY, "settings", () -> new ContentSettings()); + RegistryHelper.register(event, REGISTRY_KEY, "potions", () -> new ContentPotions()); + RegistryHelper.register(event, REGISTRY_KEY, "command_stack", () -> new ContentCommandStack()); + RegistryHelper.register(event, REGISTRY_KEY, "settings", () -> new ContentSettings()); //USERCONTENT UsercontentLoader.CONFIGS.forEach(config -> { - TranslationHelper.register(event, REGISTRY_KEY, config.getId(), () -> + RegistryHelper.register(event, REGISTRY_KEY, config.getId(), () -> { try { diff --git a/src/main/java/exopandora/worldhandler/util/RegistryHelper.java b/src/main/java/exopandora/worldhandler/util/RegistryHelper.java index ccf5efd..66683f6 100644 --- a/src/main/java/exopandora/worldhandler/util/RegistryHelper.java +++ b/src/main/java/exopandora/worldhandler/util/RegistryHelper.java @@ -1,7 +1,14 @@ package exopandora.worldhandler.util; +import java.util.function.Supplier; + +import exopandora.worldhandler.Main; import net.minecraft.core.HolderLookup.Provider; +import net.minecraft.core.Registry; import net.minecraft.data.registries.VanillaRegistries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.registries.RegisterEvent; public class RegistryHelper { @@ -22,4 +29,9 @@ public class RegistryHelper { return INSTANCE; } + + public static void register(RegisterEvent event, ResourceKey> key, String location, Supplier valueSupplier) + { + event.register(key, new ResourceLocation(Main.MODID, location), valueSupplier); + } } diff --git a/src/main/java/exopandora/worldhandler/util/TranslationHelper.java b/src/main/java/exopandora/worldhandler/util/TranslationHelper.java index 2754b0c..6e3dc2a 100644 --- a/src/main/java/exopandora/worldhandler/util/TranslationHelper.java +++ b/src/main/java/exopandora/worldhandler/util/TranslationHelper.java @@ -3,13 +3,9 @@ package exopandora.worldhandler.util; import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import java.util.function.Supplier; import javax.annotation.Nullable; -import exopandora.worldhandler.Main; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.EntityType; @@ -18,7 +14,6 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.block.Block; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.RegisterEvent; public class TranslationHelper { @@ -59,9 +54,4 @@ public class TranslationHelper return null; } - - public static void register(RegisterEvent event, ResourceKey> key, String location, Supplier valueSupplier) - { - event.register(key, new ResourceLocation(Main.MODID, location), valueSupplier); - } }