From d223c5c5bf3a02353fcb3425f4e1a0ae480ffa7c Mon Sep 17 00:00:00 2001
From: MagicHarp <@2749380016@qq.com>
Date: Wed, 16 Oct 2024 01:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=AB=E5=B1=B1=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mod/datagen/ModChineseProvider.java          |   1 +
 .../org/confluence/mod/item/sword/Swords.java    |   3 ++-
 .../assets/confluence/textures/item/volcano.png  | Bin 0 -> 2922 bytes
 .../confluence/textures/item/volcano.png.mcmeta  |   5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/confluence/textures/item/volcano.png
 create mode 100644 src/main/resources/assets/confluence/textures/item/volcano.png.mcmeta

diff --git a/src/main/java/org/confluence/mod/datagen/ModChineseProvider.java b/src/main/java/org/confluence/mod/datagen/ModChineseProvider.java
index cc349cf7f..6ee6fe8d3 100644
--- a/src/main/java/org/confluence/mod/datagen/ModChineseProvider.java
+++ b/src/main/java/org/confluence/mod/datagen/ModChineseProvider.java
@@ -1197,6 +1197,7 @@ protected void addTranslations() {
         add(Swords.ICE_BLADE.get(), "冰雪剑");
         add(Swords.EXOTIC_SCIMITAR.get(), "异域弯刀");
         add(Swords.FAKE_SWORD.get(), "假剑");
+        add(Swords.VOLCANO.get(), "火山");
 
         add(Swords.DEVELOPER_SWORD.get(),"开发者剑");
 
diff --git a/src/main/java/org/confluence/mod/item/sword/Swords.java b/src/main/java/org/confluence/mod/item/sword/Swords.java
index 429c3116b..cc9d2429b 100644
--- a/src/main/java/org/confluence/mod/item/sword/Swords.java
+++ b/src/main/java/org/confluence/mod/item/sword/Swords.java
@@ -40,8 +40,9 @@ public enum Swords implements EnumRegister<SwordItem> {
     WHITE_LIGHT_SABER("white_light_saber", LightSaber.White::new),
 
     ICE_BLADE("ice_blade", () -> new IceBladeSwordItem(ModTiers.TITANIUM, 5, -0.1F, new Item.Properties().rarity(ModRarity.BLUE))),
-    STARFURY("starfury", () -> new StarFurySword(ModTiers.TITANIUM, 6, -0.1f, new Item.Properties().rarity(ModRarity.GREEN))),//新版星怒
+    STARFURY("starfury", () -> new StarFurySword(ModTiers.TITANIUM, 6, -0.1f, new Item.Properties().rarity(ModRarity.GREEN))),// 新版星怒
     ENCHANTED_SWORD("enchanted_sword", () -> new EnchantedSwordItem(ModTiers.TITANIUM, 7, -0.2F, new Item.Properties().rarity(ModRarity.ORANGE))),
+    VOLCANO("volcano", () -> new BigRegularBroadSwordItem(ModTiers.TITANIUM, 16, -1.4F, new Item.Properties().rarity(ModRarity.ORANGE))),
 
 
     TERRAGRIM("terragrim", TerragrimItem::new),
diff --git a/src/main/resources/assets/confluence/textures/item/volcano.png b/src/main/resources/assets/confluence/textures/item/volcano.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7c1ce0436fc1114939ff9ecebe707ce2f395a54
GIT binary patch
literal 2922
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
Uq79A8ssI2007*qoM6N<$f?KnMSO5S3

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/confluence/textures/item/volcano.png.mcmeta b/src/main/resources/assets/confluence/textures/item/volcano.png.mcmeta
new file mode 100644
index 000000000..36578bcce
--- /dev/null
+++ b/src/main/resources/assets/confluence/textures/item/volcano.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 2
+    }
+}