From 5401fdf0507a628d2f0b8724a51b36818a3f4bd6 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Wed, 21 May 2025 18:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E6=B3=A2=E5=A1=9E?=
 =?UTF-8?q?=E5=85=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b69ee8a2655365569b979911c0440daa8c470ac2  |   5 +++-
 .../superbwarfare/models/item/bocek.json      |  28 ++++++++++++++++++
 .../superbwarfare/models/item/bocek_base.json |   0
 .../superbwarfare/models/item/bocek_icon.json |   2 +-
 .../datagen/ModItemModelProvider.java         |   1 +
 .../superbwarfare/models/item/bocek.json      |  27 -----------------
 .../superbwarfare/models/lod/aa_12.json       |   4 +--
 .../superbwarfare/models/lod/ak_12.json       |   2 +-
 .../superbwarfare/models/lod/ak_47.json       |   4 +--
 .../models/lod/aurelia_sceptre.json           |   4 +--
 .../{item/bocek3d.json => lod/bocek.json}     |   2 +-
 .../textures/{ => item}/lod/aa_12.png         | Bin
 .../textures/{ => item}/lod/ak_12.png         | Bin
 .../textures/{ => item}/lod/ak_47.png         | Bin
 .../{ => item}/lod/aurelia_sceptre.png        | Bin
 .../textures/item/{bsk.png => lod/bocek.png}  | Bin
 .../superbwarfare/textures/item/sks_l.png     | Bin 0 -> 430 bytes
 17 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 src/generated/resources/assets/superbwarfare/models/item/bocek.json
 rename src/{main => generated}/resources/assets/superbwarfare/models/item/bocek_base.json (100%)
 rename src/{main => generated}/resources/assets/superbwarfare/models/item/bocek_icon.json (63%)
 delete mode 100644 src/main/resources/assets/superbwarfare/models/item/bocek.json
 rename src/main/resources/assets/superbwarfare/models/{item/bocek3d.json => lod/bocek.json} (99%)
 rename src/main/resources/assets/superbwarfare/textures/{ => item}/lod/aa_12.png (100%)
 rename src/main/resources/assets/superbwarfare/textures/{ => item}/lod/ak_12.png (100%)
 rename src/main/resources/assets/superbwarfare/textures/{ => item}/lod/ak_47.png (100%)
 rename src/main/resources/assets/superbwarfare/textures/{ => item}/lod/aurelia_sceptre.png (100%)
 rename src/main/resources/assets/superbwarfare/textures/item/{bsk.png => lod/bocek.png} (100%)
 create mode 100644 src/main/resources/assets/superbwarfare/textures/item/sks_l.png

diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
index 502359e2a..4dbefaf70 100644
--- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
+++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
@@ -1,4 +1,4 @@
-// 1.21.1	2025-05-21T21:23:33.5005638	Item Models: superbwarfare
+// 1.21.1	2025-05-21T21:25:03.9313812	Item Models: superbwarfare
 6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json
 fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json
@@ -22,7 +22,10 @@ a207f0f01b87315d1b85fc3ea69bf52b2bd5c71a assets/superbwarfare/models/item/aureli
 984c08ca6f6893a15721a85e30118f9e32c65c7f assets/superbwarfare/models/item/barbed_wire.json
 e8f16946c6f9429989d05e9ec250a72ffc64f9e1 assets/superbwarfare/models/item/beam_test.json
 bda38dd5cb3ca4c3e289a012c0529609ac02ded2 assets/superbwarfare/models/item/beast.json
+48c2abeb6da0b9e65be881ce925eadde0bea4390 assets/superbwarfare/models/item/bocek.json
+55698528f99669ec9f28ae9915c26e1a686f642a assets/superbwarfare/models/item/bocek_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/bocek_blueprint.json
+b36eae36a6d85be0496aae76fe81a08d6cd60702 assets/superbwarfare/models/item/bocek_icon.json
 140e04e98d9d1c0ee790ca43cb28ad549900ab44 assets/superbwarfare/models/item/cannon_core.json
 1e5b4637c3787516305dd3d1598f401a5e78a954 assets/superbwarfare/models/item/cemented_carbide_action.json
 b793716e367623d60461fc760de4f012c28fdc53 assets/superbwarfare/models/item/cemented_carbide_barrel.json
diff --git a/src/generated/resources/assets/superbwarfare/models/item/bocek.json b/src/generated/resources/assets/superbwarfare/models/item/bocek.json
new file mode 100644
index 000000000..f7f264b63
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/bocek.json
@@ -0,0 +1,28 @@
+{
+  "parent": "minecraft:item/generated",
+  "base": {
+    "parent": "superbwarfare:item/bocek_base"
+  },
+  "gui_light": "front",
+  "loader": "neoforge:separate_transforms",
+  "perspectives": {
+    "fixed": {
+      "parent": "superbwarfare:lod/bocek"
+    },
+    "ground": {
+      "parent": "superbwarfare:lod/bocek"
+    },
+    "gui": {
+      "parent": "superbwarfare:item/bocek_icon"
+    },
+    "head": {
+      "parent": "superbwarfare:lod/bocek"
+    },
+    "thirdperson_lefthand": {
+      "parent": "superbwarfare:lod/bocek"
+    },
+    "thirdperson_righthand": {
+      "parent": "superbwarfare:lod/bocek"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek_base.json b/src/generated/resources/assets/superbwarfare/models/item/bocek_base.json
similarity index 100%
rename from src/main/resources/assets/superbwarfare/models/item/bocek_base.json
rename to src/generated/resources/assets/superbwarfare/models/item/bocek_base.json
diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek_icon.json b/src/generated/resources/assets/superbwarfare/models/item/bocek_icon.json
similarity index 63%
rename from src/main/resources/assets/superbwarfare/models/item/bocek_icon.json
rename to src/generated/resources/assets/superbwarfare/models/item/bocek_icon.json
index 6220bea26..edb56d0c9 100644
--- a/src/main/resources/assets/superbwarfare/models/item/bocek_icon.json
+++ b/src/generated/resources/assets/superbwarfare/models/item/bocek_icon.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/generated",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "superbwarfare:item/bocek_icon"
   }
diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
index 5434baa14..fda15e03a 100644
--- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
+++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
@@ -31,6 +31,7 @@ public class ModItemModelProvider extends ItemModelProvider {
         gunItem(ModItems.AK_12);
         gunItem(ModItems.AK_47);
         gunItem(ModItems.AURELIA_SCEPTRE);
+        gunItem(ModItems.BOCEK);
 
         simpleItem(ModItems.EMPTY_PERK, "perk/");
 
diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek.json b/src/main/resources/assets/superbwarfare/models/item/bocek.json
deleted file mode 100644
index 1ba668668..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/bocek.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"loader": "neoforge:separate_transforms",
-	"gui_light": "front",
-	"base": {
-		"parent": "superbwarfare:item/bocek_base"
-	},
-	"perspectives": {
-		"gui": {
-			"parent": "superbwarfare:item/bocek_icon"
-		},
-		"thirdperson_righthand": {
-			"parent": "superbwarfare:item/bocek3d"
-		},
-		"thirdperson_lefthand": {
-			"parent": "superbwarfare:item/bocek3d"
-		},
-		"ground": {
-			"parent": "superbwarfare:item/bocek3d"
-		},
-		"fixed": {
-			"parent": "superbwarfare:item/bocek3d"
-		},
-		"head": {
-			"parent": "superbwarfare:item/bocek3d"
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/lod/aa_12.json b/src/main/resources/assets/superbwarfare/models/lod/aa_12.json
index 5bbfc8029..8e6610a79 100644
--- a/src/main/resources/assets/superbwarfare/models/lod/aa_12.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/aa_12.json
@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"0": "superbwarfare:lod/aa_12",
-		"particle": "superbwarfare:lod/aa_12"
+		"0": "superbwarfare:item/lod/aa_12",
+		"particle": "superbwarfare:item/lod/aa_12"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/models/lod/ak_12.json b/src/main/resources/assets/superbwarfare/models/lod/ak_12.json
index daba6b65a..e5debdd4c 100644
--- a/src/main/resources/assets/superbwarfare/models/lod/ak_12.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/ak_12.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"1": "superbwarfare:lod/ak_12"
+		"1": "superbwarfare:item/lod/ak_12"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/models/lod/ak_47.json b/src/main/resources/assets/superbwarfare/models/lod/ak_47.json
index a204d3578..2c6930db4 100644
--- a/src/main/resources/assets/superbwarfare/models/lod/ak_47.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/ak_47.json
@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"0": "superbwarfare:lod/ak_47",
-		"particle": "superbwarfare:lod/ak_47"
+		"0": "superbwarfare:item/lod/ak_47",
+		"particle": "superbwarfare:item/lod/ak_47"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/models/lod/aurelia_sceptre.json b/src/main/resources/assets/superbwarfare/models/lod/aurelia_sceptre.json
index 0204041e6..9b0950d99 100644
--- a/src/main/resources/assets/superbwarfare/models/lod/aurelia_sceptre.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/aurelia_sceptre.json
@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "superbwarfare:lod/aurelia_sceptre",
-		"particle": "superbwarfare:lod/aurelia_sceptre"
+		"0": "superbwarfare:item/lod/aurelia_sceptre",
+		"particle": "superbwarfare:item/lod/aurelia_sceptre"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek3d.json b/src/main/resources/assets/superbwarfare/models/lod/bocek.json
similarity index 99%
rename from src/main/resources/assets/superbwarfare/models/item/bocek3d.json
rename to src/main/resources/assets/superbwarfare/models/lod/bocek.json
index 3ce37c2bd..b25e8ef6f 100644
--- a/src/main/resources/assets/superbwarfare/models/item/bocek3d.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/bocek.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"6": "superbwarfare:item/bsk"
+		"6": "superbwarfare:item/lod/bocek"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/textures/lod/aa_12.png b/src/main/resources/assets/superbwarfare/textures/item/lod/aa_12.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/lod/aa_12.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/aa_12.png
diff --git a/src/main/resources/assets/superbwarfare/textures/lod/ak_12.png b/src/main/resources/assets/superbwarfare/textures/item/lod/ak_12.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/lod/ak_12.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/ak_12.png
diff --git a/src/main/resources/assets/superbwarfare/textures/lod/ak_47.png b/src/main/resources/assets/superbwarfare/textures/item/lod/ak_47.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/lod/ak_47.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/ak_47.png
diff --git a/src/main/resources/assets/superbwarfare/textures/lod/aurelia_sceptre.png b/src/main/resources/assets/superbwarfare/textures/item/lod/aurelia_sceptre.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/lod/aurelia_sceptre.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/aurelia_sceptre.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/bsk.png b/src/main/resources/assets/superbwarfare/textures/item/lod/bocek.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/bsk.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/bocek.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/sks_l.png b/src/main/resources/assets/superbwarfare/textures/item/sks_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..54aaf12a138766db398b2bfef150083b8db7d6fd
GIT binary patch
literal 430
zcmV;f0a5;mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004XNkl<ZScUDD
zuX2Mx5Ql#-F%0^!eF5TX5pkV4m%c$<XX3F~d}r$V7M-c9z$JC%2_l0gNNRfY3d`Of
zD*4Q1hRxl#?A{&0)5Coa3tm6IaM*2!v2G&(K%VE5*th2bbsHg#JG{Jq2Hd=Xt-u&1
zK#|7X@Vu%jRv^SrcKWy!PL32f?6%OyC8TkOH14e9H>LoWY<%L40(058F61pR2PNhs
z75WNL==G<zC&gyTtDHLnbfL;HN04P%52n@%UDTz^O$U*83F<aN-A0hdVvy4%<*{J?
z{mY~YsZ9T?<E;cJTwb|C-3KPTOOOaL{9dvpCvU(fTWWFrLgEPZOnlI{9X$HQsRUeS
ztE>|tth09(&=<48^ex~mz>(Z8PVuaOI&3JeO@l;;KhL>%Cjrw$HpjN@Zn7$Yk{Ne=
za=T0xa^1%4NvLkSvMh%kpnvfyIVmOX0Gv-JfRN${9{2nH+B9s?ctWZ?HXXmRva&+)
Y4eOq!w&zU8ga7~l07*qoM6N<$f|T>dF#rGn

literal 0
HcmV?d00001