From 654fb2f9d253ee1c2d39e0de4940bb08e33e7d56 Mon Sep 17 00:00:00 2001 From: tier940 Date: Sun, 4 Jan 2026 14:46:29 +0900 Subject: [PATCH] Re: Fix DEDA JEI display --- CHANGELOG.md | 5 ++++ .../core/integration/deda/DEDAConstants.java | 8 +++++++ .../recipemaps/RecipeMapDraconicFusion.java | 10 ++++---- .../tierup/TierUpRecipeBuilder.java | 23 +++++++++++++------ .../recipemaps/tierup/TierUpRecipeInfo.java | 11 +++++++++ .../tierup/TierUpRecipeProperty.java | 15 ++++++++---- .../upgrade/UpgradeRecipeBuilder.java | 23 +++++++++++++------ .../recipemaps/upgrade/UpgradeRecipeInfo.java | 11 +++++++++ .../upgrade/UpgradeRecipeProperty.java | 15 ++++++++---- .../deda/recipes/DraconicTierupRecipe.java | 3 ++- .../deda/recipes/DraconicUpgradeRecipe.java | 5 ++++ .../resources/assets/gtexpert/lang/en_us.lang | 2 ++ .../resources/assets/gtexpert/lang/ja_jp.lang | 2 ++ 13 files changed, 104 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeInfo.java create mode 100644 src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeInfo.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b6c47bc..5c0b12ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.6.2 +- Re: Fix DEDA JEI display [#346](https://github.com/GTModpackTeam/GTExpert-Core/pull/346) + +* * * + # 2.6.1 - Fix DEDA JEI display [#345](https://github.com/GTModpackTeam/GTExpert-Core/pull/345) diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConstants.java b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConstants.java index 2056c647..63d93816 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConstants.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConstants.java @@ -52,5 +52,13 @@ public enum DraconicTier { DraconicTier(int voltageOffset) { this.voltageOffset = voltageOffset; } + + /** + * Returns true if this tier requires the Awakened Draconium Fusion Crafter (Tier II). + * CHAOTIC tier requires UV voltage which is only available on the Awakened Crafter. + */ + public boolean requiresAwakenedCrafter() { + return this == CHAOTIC; + } } } diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java index 1e60d519..7ff75ee3 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java @@ -28,8 +28,10 @@ import com.github.gtexpert.core.api.util.GTELog; import com.github.gtexpert.core.integration.deda.DEDAConfigHolder; import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeInfo; import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeInfo; import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; import cofh.redstoneflux.api.IEnergyContainerItem; @@ -63,8 +65,8 @@ public Recipe findRecipe(long voltage, List inputs, List Recipe tierUpRecipe = tierUpRecipeMap.findRecipe(voltage, inputs, fluidInputs, exactVoltage); if (tierUpRecipe != null) { - return setupOutput(tierUpRecipe, inputs, - tierUpRecipe.getProperty(TierUpRecipeProperty.getInstance(), null)); + TierUpRecipeInfo tierUpInfo = tierUpRecipe.getProperty(TierUpRecipeProperty.getInstance(), null); + return setupOutput(tierUpRecipe, inputs, tierUpInfo != null ? tierUpInfo.recipe() : null); } // Use cached lookup for upgrade recipes if enabled @@ -72,8 +74,8 @@ public Recipe findRecipe(long voltage, List inputs, List // for the specific catalyst item type, instead of all upgrade recipes Recipe upgradeRecipe = findUpgradeRecipe(voltage, inputs, fluidInputs); if (upgradeRecipe != null) { - return setupOutput(upgradeRecipe, inputs, - upgradeRecipe.getProperty(UpgradeRecipeProperty.getInstance(), null)); + UpgradeRecipeInfo upgradeInfo = upgradeRecipe.getProperty(UpgradeRecipeProperty.getInstance(), null); + return setupOutput(upgradeRecipe, inputs, upgradeInfo != null ? upgradeInfo.recipe() : null); } return null; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java index e97a6fae..e260afdd 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java @@ -20,16 +20,19 @@ import gregtech.api.util.ValidationResult; import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.DEDAConstants.DraconicTier; public class TierUpRecipeBuilder extends RecipeBuilder { private GTRecipeInput catalyst; private ItemStack result; + private boolean requiresAwakenedCrafter; public TierUpRecipeBuilder() {} public TierUpRecipeBuilder(TierUpRecipeBuilder recipeBuilder) { super(recipeBuilder); + this.requiresAwakenedCrafter = recipeBuilder.requiresAwakenedCrafter; } @Override @@ -42,8 +45,8 @@ public boolean applyProperty(@NotNull String key, @Nullable Object value) { if (!key.equals(TierUpRecipeProperty.KEY)) { return super.applyProperty(key, value); } - if (!(value instanceof ToolUpgradeRecipe)) { - GTELog.logger.error("Property for draconic upgrade must be an instance of ToolUpgradeRecipe!", + if (!(value instanceof TierUpRecipeInfo)) { + GTELog.logger.error("Property for draconic upgrade must be an instance of TierUpRecipeInfo!", new Throwable()); } this.applyProperty(TierUpRecipeProperty.getInstance(), value); @@ -85,13 +88,14 @@ public ValidationResult build() { } private void setFusionProperties() { - setFusionRecipe(new ToolUpgradeRecipe( + ToolUpgradeRecipe toolRecipe = new ToolUpgradeRecipe( result, catalyst.getInputStacks()[0], 0, 0, new ItemStack(Blocks.DIRT) // fake item to avoid crash - )); + ); + setFusionRecipe(new TierUpRecipeInfo(toolRecipe, requiresAwakenedCrafter)); inputs.add(0, catalyst); outputs.add(result); } @@ -114,8 +118,13 @@ public TierUpRecipeBuilder result(ItemStack result) { return this; } - public void setFusionRecipe(ToolUpgradeRecipe fusionRecipe) { - applyProperty(TierUpRecipeProperty.getInstance(), fusionRecipe); + public TierUpRecipeBuilder tier(DraconicTier tier) { + this.requiresAwakenedCrafter = tier.requiresAwakenedCrafter(); + return this; + } + + public void setFusionRecipe(TierUpRecipeInfo recipeInfo) { + applyProperty(TierUpRecipeProperty.getInstance(), recipeInfo); } public GTRecipeInput getCatalyst() { @@ -126,7 +135,7 @@ public ItemStack getResult() { return result; } - public ToolUpgradeRecipe getFusionRecipe() { + public TierUpRecipeInfo getFusionRecipe() { return this.recipePropertyStorage == null ? null : this.recipePropertyStorage.getRecipePropertyValue(TierUpRecipeProperty.getInstance(), null); } diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeInfo.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeInfo.java new file mode 100644 index 00000000..41755650 --- /dev/null +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeInfo.java @@ -0,0 +1,11 @@ +package com.github.gtexpert.core.integration.deda.recipemaps.tierup; + +import com.brandon3055.draconicevolution.lib.ToolUpgradeRecipe; +import com.github.bsideup.jabel.Desugar; + +/** + * Wrapper for tier-up recipe info including the original Draconic Evolution recipe + * and machine tier requirement. + */ +@Desugar +public record TierUpRecipeInfo(ToolUpgradeRecipe recipe, boolean requiresAwakenedCrafter) {} diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java index e2215e47..63d48bae 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java @@ -3,17 +3,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; -import com.brandon3055.draconicevolution.lib.ToolUpgradeRecipe; - import gregtech.api.recipes.recipeproperties.RecipeProperty; -public class TierUpRecipeProperty extends RecipeProperty { +public class TierUpRecipeProperty extends RecipeProperty { public static final String KEY = "draconic_fusion_tier_up"; private static TierUpRecipeProperty INSTANCE; private TierUpRecipeProperty() { - super(KEY, ToolUpgradeRecipe.class); + super(KEY, TierUpRecipeInfo.class); } public static TierUpRecipeProperty getInstance() { @@ -25,6 +23,13 @@ public static TierUpRecipeProperty getInstance() { @Override public void drawInfo(Minecraft minecraft, int x, int y, int color, Object value) { + TierUpRecipeInfo info = castValue(value); + String crafterKey = info.requiresAwakenedCrafter() ? + "recipemap.draconic_fusion.crafter.awakened" : + "recipemap.draconic_fusion.crafter.draconium"; + // Draw 3 lines: crafter tier, property line 1, property line 2 + // Compensate for getInfoHeight=30 by drawing at y-20, y-10, y + minecraft.fontRenderer.drawString(I18n.format(crafterKey), x, y - 20, color); minecraft.fontRenderer.drawString(I18n.format("recipemap.draconic_fusion_tier_up.property.1"), x, y - 10, color); minecraft.fontRenderer.drawString(I18n.format("recipemap.draconic_fusion_tier_up.property.2"), x, y, color); @@ -32,6 +37,6 @@ public void drawInfo(Minecraft minecraft, int x, int y, int color, Object value) @Override public int getInfoHeight(Object value) { - return 20; + return 30; } } diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java index dcecb6eb..392437bf 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java @@ -23,12 +23,14 @@ import gregtech.api.util.ValidationResult; import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.DEDAConstants.DraconicTier; public class UpgradeRecipeBuilder extends RecipeBuilder { private ItemStack catalyst; private String upgradeName; private int currentLevel = -1; + private boolean requiresAwakenedCrafter; public UpgradeRecipeBuilder() {} @@ -37,6 +39,7 @@ public UpgradeRecipeBuilder(UpgradeRecipeBuilder recipeBuilder) { this.catalyst = recipeBuilder.catalyst; this.upgradeName = recipeBuilder.upgradeName; this.currentLevel = recipeBuilder.currentLevel; + this.requiresAwakenedCrafter = recipeBuilder.requiresAwakenedCrafter; } @Override @@ -49,8 +52,8 @@ public boolean applyProperty(@NotNull String key, @Nullable Object value) { if (!key.equals(UpgradeRecipeProperty.KEY)) { return super.applyProperty(key, value); } - if (!(value instanceof FusionUpgradeRecipe)) { - GTELog.logger.error("Property for draconic upgrade must be an instance of FusionUpgradeRecipe!", + if (!(value instanceof UpgradeRecipeInfo)) { + GTELog.logger.error("Property for draconic upgrade must be an instance of UpgradeRecipeInfo!", new Throwable()); } this.applyProperty(UpgradeRecipeProperty.getInstance(), value); @@ -123,13 +126,14 @@ private void setFusionProperties() { outputs.add(output); ItemStack upgradeKey = new ItemStack(DEFeatures.toolUpgrade, 1, ToolUpgrade.NAME_TO_ID.get(upgradeName)); - setFusionRecipe(new FusionUpgradeRecipe( + FusionUpgradeRecipe fusionRecipe = new FusionUpgradeRecipe( upgradeName, upgradeKey, 0, currentLevel, upgradeLevel, - input)); + input); + setFusionRecipe(new UpgradeRecipeInfo(fusionRecipe, requiresAwakenedCrafter)); inputs.add(1, new GTRecipeItemInput(upgradeKey, upgradeKey.getCount()).setNonConsumable()); } @@ -148,8 +152,13 @@ public UpgradeRecipeBuilder level(int level) { return this; } - public void setFusionRecipe(FusionUpgradeRecipe fusionRecipe) { - applyProperty(UpgradeRecipeProperty.getInstance(), fusionRecipe); + public UpgradeRecipeBuilder tier(DraconicTier tier) { + this.requiresAwakenedCrafter = tier.requiresAwakenedCrafter(); + return this; + } + + public void setFusionRecipe(UpgradeRecipeInfo recipeInfo) { + applyProperty(UpgradeRecipeProperty.getInstance(), recipeInfo); } public ItemStack getCatalyst() { @@ -164,7 +173,7 @@ public int getCurrentLevel() { return currentLevel; } - public FusionUpgradeRecipe getFusionRecipe() { + public UpgradeRecipeInfo getFusionRecipe() { return this.recipePropertyStorage == null ? null : this.recipePropertyStorage.getRecipePropertyValue(UpgradeRecipeProperty.getInstance(), null); } diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeInfo.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeInfo.java new file mode 100644 index 00000000..b486e2e9 --- /dev/null +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeInfo.java @@ -0,0 +1,11 @@ +package com.github.gtexpert.core.integration.deda.recipemaps.upgrade; + +import com.brandon3055.draconicevolution.api.itemupgrade.FusionUpgradeRecipe; +import com.github.bsideup.jabel.Desugar; + +/** + * Wrapper for upgrade recipe info including the original Draconic Evolution recipe + * and machine tier requirement. + */ +@Desugar +public record UpgradeRecipeInfo(FusionUpgradeRecipe recipe, boolean requiresAwakenedCrafter) {} diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java index 9d27c63c..5d8f9af6 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java @@ -3,17 +3,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; -import com.brandon3055.draconicevolution.api.itemupgrade.FusionUpgradeRecipe; - import gregtech.api.recipes.recipeproperties.RecipeProperty; -public class UpgradeRecipeProperty extends RecipeProperty { +public class UpgradeRecipeProperty extends RecipeProperty { public static final String KEY = "draconic_fusion_upgrade"; private static UpgradeRecipeProperty INSTANCE; private UpgradeRecipeProperty() { - super(KEY, FusionUpgradeRecipe.class); + super(KEY, UpgradeRecipeInfo.class); } public static UpgradeRecipeProperty getInstance() { @@ -25,6 +23,13 @@ public static UpgradeRecipeProperty getInstance() { @Override public void drawInfo(Minecraft minecraft, int x, int y, int color, Object value) { + UpgradeRecipeInfo info = castValue(value); + String crafterKey = info.requiresAwakenedCrafter() ? + "recipemap.draconic_fusion.crafter.awakened" : + "recipemap.draconic_fusion.crafter.draconium"; + // Draw 3 lines: crafter tier, property line 1, property line 2 + // Compensate for getInfoHeight=30 by drawing at y-20, y-10, y + minecraft.fontRenderer.drawString(I18n.format(crafterKey), x, y - 20, color); minecraft.fontRenderer.drawString(I18n.format("recipemap.draconic_fusion_upgrade.property.1"), x, y - 10, color); minecraft.fontRenderer.drawString(I18n.format("recipemap.draconic_fusion_upgrade.property.2"), x, y, color); @@ -32,6 +37,6 @@ public void drawInfo(Minecraft minecraft, int x, int y, int color, Object value) @Override public int getInfoHeight(Object value) { - return 20; + return 30; } } diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java index 2ac7caac..cb79a2f7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java @@ -141,6 +141,7 @@ public static void init() { GTEDraconicRecipeMaps.DRACONIC_FUSION_TIER_UP_RECIPES.recipeBuilder() .catalyst(DEDARecipeHelper.inputWithAnyNBT(new ItemStack(DEFeatures.draconicPick))) .result(new ItemStack(DEFeatures.draconicStaffOfPower)) + .tier(DraconicTier.DRACONIC) .input(plate, GTEMaterials.Draconium, 6) .inputNBT(DEFeatures.draconicAxe, NBTMatcher.ANY, NBTCondition.ANY) .inputNBT(DEFeatures.draconicShovel, NBTMatcher.ANY, NBTCondition.ANY) @@ -228,7 +229,7 @@ private static void addTierUpRecipe(ItemStack catalyst, ItemStack result, Dracon private static void addTierUpRecipe(GTRecipeInput catalyst, ItemStack result, DraconicTier tier, int plateAmount) { TierUpRecipeBuilder recipeBuilder = GTEDraconicRecipeMaps.DRACONIC_FUSION_TIER_UP_RECIPES.recipeBuilder(); - recipeBuilder.catalyst(catalyst).result(result); + recipeBuilder.catalyst(catalyst).result(result).tier(tier); switch (tier) { case WYVERN -> recipeBuilder diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java index 12c8ecc7..d60a8607 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java @@ -19,6 +19,7 @@ import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.DEDAConstants.DraconicTier; import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; @@ -71,6 +72,7 @@ public static void init() { switch (currentLevel) { case 0 -> recipeBuilder + .tier(DraconicTier.WYVERN) .input(Items.GOLDEN_APPLE, 2) .input(OrePrefix.gem, Materials.Diamond, 2) .input(OrePrefix.gem, Materials.EnderEye, 2) @@ -79,6 +81,7 @@ public static void init() { .fluidOutputs(GTEMaterials.Pyrotheum.getFluid(GCYMFluidStorageKeys.MOLTEN, 2000)) .duration(100).EUt(VA[GTEValues.dedaVoltageTier - 1]); case 1 -> recipeBuilder + .tier(DraconicTier.WYVERN) .input(OrePrefix.gem, Materials.NetherStar, 2) .input(DEFeatures.wyvernCore, 2) .input(OrePrefix.gem, Materials.Emerald, 2) @@ -87,6 +90,7 @@ public static void init() { .fluidOutputs(GTEMaterials.Pyrotheum.getFluid(GCYMFluidStorageKeys.MOLTEN, 4000)) .duration(200).EUt(VA[GTEValues.dedaVoltageTier]); case 2 -> recipeBuilder + .tier(DraconicTier.DRACONIC) .input(OrePrefix.gem, Materials.NetherStar, 2) .input(DEFeatures.draconicCore, 2) .input(OrePrefix.block, Materials.Emerald, 2) @@ -95,6 +99,7 @@ public static void init() { .fluidOutputs(GTEMaterials.Pyrotheum.getFluid(GCYMFluidStorageKeys.MOLTEN, 8000)) .duration(400).EUt(VA[GTEValues.dedaVoltageTier + 1]); case 3 -> recipeBuilder + .tier(DraconicTier.CHAOTIC) .input(DEFeatures.draconicCore, 2) .input(DEFeatures.awakenedCore, 2) .input(Blocks.DRAGON_EGG, 2) diff --git a/src/main/resources/assets/gtexpert/lang/en_us.lang b/src/main/resources/assets/gtexpert/lang/en_us.lang index 354056e8..ad43f618 100644 --- a/src/main/resources/assets/gtexpert/lang/en_us.lang +++ b/src/main/resources/assets/gtexpert/lang/en_us.lang @@ -236,6 +236,8 @@ recipemap.draconic_fusion_upgrade.name=Draconic Equipment Upgrades recipemap.awakened_draconic_fusion_upgrade.name=Draconic Equipment Upgrades recipemap.draconic_fusion_upgrade.property.1=Preserves upgrade info recipemap.draconic_fusion_upgrade.property.2= and stored energy +recipemap.draconic_fusion.crafter.draconium=Requires: Fusion Crafter I +recipemap.draconic_fusion.crafter.awakened=Requires: Fusion Crafter II recipemap.advanced_chemical_plant.name=Advanced Chemical Plant recipemap.large_gas_collector.name=Large Gas Collector recipemap.steam_mixer.name=Steam Mixer diff --git a/src/main/resources/assets/gtexpert/lang/ja_jp.lang b/src/main/resources/assets/gtexpert/lang/ja_jp.lang index 5409528f..6d32ddb4 100644 --- a/src/main/resources/assets/gtexpert/lang/ja_jp.lang +++ b/src/main/resources/assets/gtexpert/lang/ja_jp.lang @@ -236,6 +236,8 @@ recipemap.draconic_fusion_upgrade.name=ドラコニック装備のアップグ recipemap.awakened_draconic_fusion_upgrade.name=ドラコニック装備のアップグレード recipemap.draconic_fusion_upgrade.property.1=アップグレードの状態と蓄電量は recipemap.draconic_fusion_upgrade.property.2= 保持されます +recipemap.draconic_fusion.crafter.draconium=要求: ドラコニック融合機 I +recipemap.draconic_fusion.crafter.awakened=要求: ドラコニック融合機 II recipemap.advanced_chemical_plant.name=発展型化学プラント recipemap.large_gas_collector.name=大型ガス収集機 recipemap.steam_mixer.name=蒸気式ミキサー