From 40050a79fabcf14ba9501b43f1f53d20ad2d9cd7 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 14 Aug 2024 02:12:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=87=E7=BA=A7=E7=82=B9?= =?UTF-8?q?=E6=95=B0=E7=9A=84tips=E3=80=81=E9=87=8D=E9=93=B8=E5=8F=B0?= =?UTF-8?q?=E7=9A=84=E5=90=88=E6=88=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/PlayerEventHandler.java | 2 +- .../superbwarfare/tools/TooltipTool.java | 7 +++++ .../assets/superbwarfare/lang/en_us.json | 1 + .../assets/superbwarfare/lang/zh_cn.json | 1 + .../loot_modifiers/global_loot_modifiers.json | 3 +- .../loot_tables/chests/ancient_cpu.json | 2 +- .../recipes/reforging_table_crafting.json | 30 +++++++++++++++++++ 7 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java index 70e6d58ea..a4fa1edbc 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java @@ -246,7 +246,7 @@ public class PlayerEventHandler { if (tag.getDouble("damagetotal") >= tag.getDouble("exp2")) { tag.putDouble("exp1", (tag.getDouble("exp2"))); tag.putInt("level", tag.getInt("level") + 1); - tag.putDouble("UpgradePoint", tag.getDouble("UpgradePoint") + 0.2); + tag.putDouble("UpgradePoint", tag.getDouble("UpgradePoint") + 0.33334); } tag.putDouble("damagenow", (tag.getDouble("damagetotal") - tag.getDouble("exp1"))); tag.putDouble("damageneed", (tag.getDouble("exp2") - tag.getDouble("exp1"))); diff --git a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java index eacc755aa..d5b9cd01a 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java @@ -10,6 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; @@ -77,6 +78,12 @@ public class TooltipTool { .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(level + " " + new DecimalFormat("##.##").format(rate * 100) + "%").withStyle(formatting).withStyle(ChatFormatting.BOLD))); + int upgradePoint = Mth.floor(ItemNBTTool.getDouble(stack, "UpgradePoint", 0)); + + tooltip.add(Component.translatable("des.superbwarfare.tips.upgradepoint").withStyle(ChatFormatting.GRAY) + .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.literal(String.valueOf(upgradePoint)).withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.BOLD))); + } private static void addBypassTips(List tooltip, ItemStack stack) { diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index eee6151dc..5ea3f21d8 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -48,6 +48,7 @@ "des.superbwarfare.tips.level": "Level: ", "des.superbwarfare.tips.bypass": "Armor Piercing: ", "des.superbwarfare.tips.distance": "Drone Distance: ", + "des.superbwarfare.tips.upgradepoint": "Ppgrade Point: ", "item.superbwarfare.vector_blueprint": "VECTOR Blueprint", "item.superbwarfare.m_60_blueprint": "M60 Blueprint", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index c15bad9fc..c12ec6364 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -44,6 +44,7 @@ "item.superbwarfare.qbz_95": "95-1式自动步枪", "item.superbwarfare.k_98": "KAR-98K", + "des.superbwarfare.tips.upgradepoint": "升级点数: ", "des.superbwarfare.tips.damage": "伤害: ", "des.superbwarfare.tips.level": "等级: ", "des.superbwarfare.tips.bypass": "护甲穿透: ", diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index 865b5ba86..94dfbafca 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -19,7 +19,8 @@ "superbwarfare:epic_chest", "superbwarfare:epic_chest_2", "superbwarfare:epic_chest_3", - "superbwarfare:epic_chest_4" + "superbwarfare:epic_chest_4", + "superbwarfare:ancient_cpu_chest" ], "replace": false } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json b/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json index 0c87d4a99..722827ccb 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json @@ -13,7 +13,7 @@ "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.2 + "chance": 0.4 } ] } diff --git a/src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json b/src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json new file mode 100644 index 000000000..a33925267 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "abc", + "ded", + "ddd" + ], + "key": { + "a": { + "item": "minecraft:gold_ingot" + }, + "b": { + "item": "minecraft:diamond" + }, + "c": { + "item": "minecraft:redstone" + }, + "d": { + "item": "minecraft:polished_basalt" + }, + "e": { + "item": "superbwarfare:ancient_cpu" + } + }, + "result": { + "item": "superbwarfare:reforging_table", + "count": 1 + } +} \ No newline at end of file