From 267e6b7a0da57896dd26d8caef2010004f42c117 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Thu, 22 May 2025 02:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E5=93=A8=E5=85=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/models/item/sentinel.json   |  28 ++++++++++++++++++
 .../models/item/sentinel_base.json            |   0
 .../models/item/sentinel_icon.json            |   2 +-
 .../datagen/ModItemModelProvider.java         |   1 +
 .../superbwarfare/models/item/sentinel.json   |  27 -----------------
 .../sentinel3d.json => lod/sentinel.json}     |   4 +--
 .../item/{sentinel3d.png => lod/sentinel.png} | Bin
 7 files changed, 32 insertions(+), 30 deletions(-)
 create mode 100644 src/generated/resources/assets/superbwarfare/models/item/sentinel.json
 rename src/{main => generated}/resources/assets/superbwarfare/models/item/sentinel_base.json (100%)
 rename src/{main => generated}/resources/assets/superbwarfare/models/item/sentinel_icon.json (64%)
 delete mode 100644 src/main/resources/assets/superbwarfare/models/item/sentinel.json
 rename src/main/resources/assets/superbwarfare/models/{item/sentinel3d.json => lod/sentinel.json} (98%)
 rename src/main/resources/assets/superbwarfare/textures/item/{sentinel3d.png => lod/sentinel.png} (100%)

diff --git a/src/generated/resources/assets/superbwarfare/models/item/sentinel.json b/src/generated/resources/assets/superbwarfare/models/item/sentinel.json
new file mode 100644
index 000000000..dd19250c6
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/sentinel.json
@@ -0,0 +1,28 @@
+{
+  "parent": "minecraft:item/generated",
+  "base": {
+    "parent": "superbwarfare:item/sentinel_base"
+  },
+  "gui_light": "front",
+  "loader": "forge:separate_transforms",
+  "perspectives": {
+    "fixed": {
+      "parent": "superbwarfare:lod/sentinel"
+    },
+    "ground": {
+      "parent": "superbwarfare:lod/sentinel"
+    },
+    "gui": {
+      "parent": "superbwarfare:item/sentinel_icon"
+    },
+    "head": {
+      "parent": "superbwarfare:lod/sentinel"
+    },
+    "thirdperson_lefthand": {
+      "parent": "superbwarfare:lod/sentinel"
+    },
+    "thirdperson_righthand": {
+      "parent": "superbwarfare:lod/sentinel"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/sentinel_base.json b/src/generated/resources/assets/superbwarfare/models/item/sentinel_base.json
similarity index 100%
rename from src/main/resources/assets/superbwarfare/models/item/sentinel_base.json
rename to src/generated/resources/assets/superbwarfare/models/item/sentinel_base.json
diff --git a/src/main/resources/assets/superbwarfare/models/item/sentinel_icon.json b/src/generated/resources/assets/superbwarfare/models/item/sentinel_icon.json
similarity index 64%
rename from src/main/resources/assets/superbwarfare/models/item/sentinel_icon.json
rename to src/generated/resources/assets/superbwarfare/models/item/sentinel_icon.json
index 2190b10c0..f53be4671 100644
--- a/src/main/resources/assets/superbwarfare/models/item/sentinel_icon.json
+++ b/src/generated/resources/assets/superbwarfare/models/item/sentinel_icon.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/generated",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "superbwarfare:item/sentinel_icon"
   }
diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
index 0fd60ebea..394fab66c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
+++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
@@ -57,6 +57,7 @@ public class ModItemModelProvider extends ItemModelProvider {
         gunItem(ModItems.RPG);
         gunItem(ModItems.RPK);
         gunItem(ModItems.SECONDARY_CATACLYSM);
+        gunItem(ModItems.SENTINEL);
 
         simpleItem(ModItems.EMPTY_PERK, "perk/");
 
diff --git a/src/main/resources/assets/superbwarfare/models/item/sentinel.json b/src/main/resources/assets/superbwarfare/models/item/sentinel.json
deleted file mode 100644
index 611fa2b96..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/sentinel.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"loader": "neoforge:separate_transforms",
-	"gui_light": "front",
-	"base": {
-		"parent": "superbwarfare:item/sentinel_base"
-	},
-	"perspectives": {
-		"gui": {
-			"parent": "superbwarfare:item/sentinel_icon"
-		},
-		"thirdperson_righthand": {
-			"parent": "superbwarfare:item/sentinel3d"
-		},
-		"thirdperson_lefthand": {
-			"parent": "superbwarfare:item/sentinel3d"
-		},
-		"ground": {
-			"parent": "superbwarfare:item/sentinel3d"
-		},
-		"fixed": {
-			"parent": "superbwarfare:item/sentinel3d"
-		},
-		"head": {
-			"parent": "superbwarfare:item/sentinel3d"
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/sentinel3d.json b/src/main/resources/assets/superbwarfare/models/lod/sentinel.json
similarity index 98%
rename from src/main/resources/assets/superbwarfare/models/item/sentinel3d.json
rename to src/main/resources/assets/superbwarfare/models/lod/sentinel.json
index c1f6722f2..a0b50d9cf 100644
--- a/src/main/resources/assets/superbwarfare/models/item/sentinel3d.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/sentinel.json
@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "superbwarfare:item/sentinel3d",
-		"particle": "superbwarfare:item/sentinel3d"
+		"0": "superbwarfare:item/lod/sentinel",
+		"particle": "superbwarfare:item/lod/sentinel"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/textures/item/sentinel3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/sentinel.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/sentinel3d.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/sentinel.png