refactor(template item field names)

nvb-uy · Sep 2, 2024 · e9c9a11 · e9c9a11
1 parent c8bccad
commit e9c9a11
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/elocindev/eldritch_end/datagen/ModelGenerator.java b/src/main/java/elocindev/eldritch_end/datagen/ModelGenerator.java
@@ -119,8 +119,8 @@ public void generateItemModels(ItemModelGenerator generator) {
         generator.register(ArmorRegistry.ETYRITE_LEGGINGS, Models.GENERATED);
         generator.register(ArmorRegistry.ETYRITE_BOOTS, Models.GENERATED);
 
-        generator.register(ItemRegistry.ETYR_UPGRADE_TEMPLATE, Models.GENERATED);
-        generator.register(ItemRegistry.CORRUPTION_UPGRADE_PATTERN, Models.GENERATED);
+        generator.register(ItemRegistry.ETYR_INFUSION_TEMPLATE, Models.GENERATED);
+        generator.register(ItemRegistry.CORRUPTION_INFUSION_TEMPLATE, Models.GENERATED);
         generator.register(ItemRegistry.OMINOUS_EYE, Models.GENERATED);
         // generator.register(ItemRegistry.HASTUR_CROWN, Models.GENERATED);
     }

diff --git a/src/main/java/elocindev/eldritch_end/item/infusion_materials/AberrationHeartItem.java b/src/main/java/elocindev/eldritch_end/item/infusion_materials/AberrationHeartItem.java
@@ -40,7 +40,7 @@ public List<InfusionAttributeHolder> getInfusionAttributes() {
 
     @Override
     public Item getInfusionTemplate() {
-        return ItemRegistry.CORRUPTION_UPGRADE_PATTERN;
+        return ItemRegistry.CORRUPTION_INFUSION_TEMPLATE;
     }
 
     @Override

diff --git a/src/main/java/elocindev/eldritch_end/item/infusion_materials/AberrationLimbItem.java b/src/main/java/elocindev/eldritch_end/item/infusion_materials/AberrationLimbItem.java
@@ -30,7 +30,7 @@ public List<InfusionAttributeHolder> getInfusionAttributes() {
 
     @Override
     public Item getInfusionTemplate() {
-        return ItemRegistry.CORRUPTION_UPGRADE_PATTERN;
+        return ItemRegistry.CORRUPTION_INFUSION_TEMPLATE;
     }
 
     @Override

diff --git a/src/main/java/elocindev/eldritch_end/item/infusion_materials/EtyrIngot.java b/src/main/java/elocindev/eldritch_end/item/infusion_materials/EtyrIngot.java
@@ -29,7 +29,7 @@ public List<InfusionAttributeHolder> getInfusionAttributes() {
 
     @Override
     public Item getInfusionTemplate() {
-        return ItemRegistry.ETYR_UPGRADE_TEMPLATE;
+        return ItemRegistry.ETYR_INFUSION_TEMPLATE;
     }
 
     @Override

diff --git a/src/main/java/elocindev/eldritch_end/item/relics/Xal.java b/src/main/java/elocindev/eldritch_end/item/relics/Xal.java
@@ -169,7 +169,7 @@ public List<InfusionAttributeHolder> getInfusionAttributes() {
 
     @Override
     public Item getInfusionTemplate() {
-        return ItemRegistry.CORRUPTION_UPGRADE_PATTERN;
+        return ItemRegistry.CORRUPTION_INFUSION_TEMPLATE;
     }
 
     @Override

diff --git a/src/main/java/elocindev/eldritch_end/registry/ItemGroupRegistry.java b/src/main/java/elocindev/eldritch_end/registry/ItemGroupRegistry.java
@@ -23,8 +23,8 @@ public class ItemGroupRegistry {
             entries.add(new ItemStack(ItemRegistry.RAW_ETYR));
             entries.add(new ItemStack(ItemRegistry.ETYR_INGOT));
 
-            entries.add(new ItemStack(ItemRegistry.CORRUPTION_UPGRADE_PATTERN));
-            entries.add(new ItemStack(ItemRegistry.ETYR_UPGRADE_TEMPLATE));
+            entries.add(new ItemStack(ItemRegistry.CORRUPTION_INFUSION_TEMPLATE));
+            entries.add(new ItemStack(ItemRegistry.ETYR_INFUSION_TEMPLATE));
 
             entries.add(new ItemStack(ArmorRegistry.ETYRITE_HELMET));
             entries.add(new ItemStack(ArmorRegistry.ETYRITE_CHESTPLATE));

diff --git a/src/main/java/elocindev/eldritch_end/registry/ItemRegistry.java b/src/main/java/elocindev/eldritch_end/registry/ItemRegistry.java
@@ -75,7 +75,7 @@ public class ItemRegistry {
         "all" : 
         (Configs.Mechanics.INFUSIONS.corruption_infusion.can_apply_to_armor ? "armor" : 
         (Configs.Mechanics.INFUSIONS.corruption_infusion.can_apply_to_weapons ? "weapons" : "none"));
-    public static final Item ETYR_UPGRADE_TEMPLATE = reg(new EtyrTemplate(
+    public static final Item ETYR_INFUSION_TEMPLATE = reg(new EtyrTemplate(
             Text.translatable("infusion.eldritch_end.applies_to_"+etyr_appliesto).setStyle(Style.EMPTY.withColor(Formatting.BLUE)),
             Text.translatable("item.eldritch_end.etyr_ingot").setStyle(Style.EMPTY.withColor(Formatting.BLUE)).append(Text.literal(" (Tier I)").setStyle(Style.EMPTY.withColor(Formatting.DARK_GRAY))),
             TextAPI.Styles.getStaticGradient(Text.literal("Etyr Infusion"), 0x728062, 0x7a966b),
@@ -85,7 +85,7 @@ public class ItemRegistry {
             List.of()
         ), "etyr_upgrade_pattern");
 
-    public static final Item CORRUPTION_UPGRADE_PATTERN = reg(new CorruptionTemplate(
+    public static final Item CORRUPTION_INFUSION_TEMPLATE = reg(new CorruptionTemplate(
             Text.translatable("infusion.eldritch_end.applies_to_"+corruption_appliesto).setStyle(Style.EMPTY.withColor(Formatting.BLUE)),
             (Text.translatable("item.eldritch_end.aberration_limb")).setStyle(Style.EMPTY.withColor(Formatting.BLUE)).append(Text.literal(" (Tier I)").setStyle(Style.EMPTY.withColor(Formatting.DARK_GRAY))),
             TextAPI.Styles.getStaticGradient(Text.literal("Corruption Infusion"), 0x604bb8, 0x6541bf),

diff --git a/src/main/java/elocindev/eldritch_end/registry/LootRegistry.java b/src/main/java/elocindev/eldritch_end/registry/LootRegistry.java
@@ -10,9 +10,9 @@ public class LootRegistry {
     public static void register() {
         LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> {
             if (source.isBuiltin() && LootTables.END_CITY_TREASURE_CHEST.equals(id)) {
-                LootPool corruption = LootPool.builder().with(ItemEntry.builder(ItemRegistry.CORRUPTION_UPGRADE_PATTERN).build()).rolls(BinomialLootNumberProvider.create(1, 0.10F)).build();
+                LootPool corruption = LootPool.builder().with(ItemEntry.builder(ItemRegistry.CORRUPTION_INFUSION_TEMPLATE).build()).rolls(BinomialLootNumberProvider.create(1, 0.10F)).build();
 
-                LootPool etyr = LootPool.builder().with(ItemEntry.builder(ItemRegistry.ETYR_UPGRADE_TEMPLATE).build()).rolls(BinomialLootNumberProvider.create(1, 0.10F)).build();
+                LootPool etyr = LootPool.builder().with(ItemEntry.builder(ItemRegistry.ETYR_INFUSION_TEMPLATE).build()).rolls(BinomialLootNumberProvider.create(1, 0.10F)).build();
 
                 tableBuilder.pool(etyr);
                 tableBuilder.pool(corruption);