From b1380e867a0c8c2fee1effea7853813689d488cc Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 21 May 2025 19:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96glock=2017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 8 ++++- .../superbwarfare/models/item/devotion.json | 28 ++++++++++++++++++ .../models/item/devotion_base.json | 0 .../models/item/devotion_icon.json | 2 +- .../superbwarfare/models/item/glock_17.json | 28 ++++++++++++++++++ .../models/item/glock_17_base.json | 6 ++++ .../models/item/glock_17_icon.json | 6 ++++ .../client/model/item/Glock17ItemModel.java | 6 ++-- .../client/model/item/Glock18ItemModel.java | 4 +-- .../client/model/item/M1911ItemModel.java | 2 +- .../client/model/item/Mp443ItemModel.java | 2 +- .../datagen/ModItemModelProvider.java | 2 ++ .../item/gun/handgun/Glock17Item.java | 14 ++++----- .../item/gun/handgun/Glock18Item.java | 2 +- ...animation.json => glock_17.animation.json} | 10 +++---- .../{glock17.geo.json => glock_17.geo.json} | 2 +- .../{glock17.item.json => glock_17.item.json} | 0 .../superbwarfare/models/item/devotion.json | 27 ----------------- .../models/item/glock17_icon.json | 6 ---- .../superbwarfare/models/item/glock_17.json | 27 ----------------- .../models/item/glock_17_base.json | 6 ---- .../devotion3d.json => lod/devotion.json} | 4 +-- .../glock17_3d.json => lod/glock_17.json} | 4 +-- .../{glock_icon.png => glock_17_icon.png} | Bin .../item/{glock17.png => glock_17.png} | Bin .../{glock17_icon.png => glock_17_icon.png} | Bin .../item/{devotion3d.png => lod/devotion.png} | Bin .../item/{glock17_3d.png => lod/glock_17.png} | Bin 28 files changed, 103 insertions(+), 93 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/devotion.json rename src/{main => generated}/resources/assets/superbwarfare/models/item/devotion_base.json (100%) rename src/{main => generated}/resources/assets/superbwarfare/models/item/devotion_icon.json (64%) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/glock_17.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/glock_17_base.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/glock_17_icon.json rename src/main/resources/assets/superbwarfare/animations/{glock17.animation.json => glock_17.animation.json} (99%) rename src/main/resources/assets/superbwarfare/geo/{glock17.geo.json => glock_17.geo.json} (99%) rename src/main/resources/assets/superbwarfare/models/displaysettings/{glock17.item.json => glock_17.item.json} (100%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/devotion.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/glock17_icon.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/glock_17.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/glock_17_base.json rename src/main/resources/assets/superbwarfare/models/{item/devotion3d.json => lod/devotion.json} (99%) rename src/main/resources/assets/superbwarfare/models/{item/glock17_3d.json => lod/glock_17.json} (97%) rename src/main/resources/assets/superbwarfare/textures/gun_icon/{glock_icon.png => glock_17_icon.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{glock17.png => glock_17.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{glock17_icon.png => glock_17_icon.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{devotion3d.png => lod/devotion.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{glock17_3d.png => lod/glock_17.png} (100%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 4dbefaf70..46dd17bb2 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T21:25:03.9313812 Item Models: superbwarfare +// 1.21.1 2025-05-21T21:28:40.4565326 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 @@ -40,7 +40,10 @@ fc892b610a110980dbc6f8e2c080672b5dc06e99 assets/superbwarfare/models/item/copper 7e43d8e9c4b8589f7665c46d4b67de645949cc6b assets/superbwarfare/models/item/creative_charging_station.json b0296c3d68f3b5ae4945b46384fa20a1ff32cac5 assets/superbwarfare/models/item/crowbar.json d81b738e17048945459ff8b59f8f83e872171473 assets/superbwarfare/models/item/defuser.json +b863c75950f3d5f18b49d829ab05996ceeae24e1 assets/superbwarfare/models/item/devotion.json +db98560069ace15f83e790a374e0e58eee5ae3c7 assets/superbwarfare/models/item/devotion_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/devotion_blueprint.json +10273ef8d8767554add02a877f4e2b230ad25a79 assets/superbwarfare/models/item/devotion_icon.json 6f4a829dc159f1740f52265d01730ecb6a840d81 assets/superbwarfare/models/item/dog_tag.json 9112aa14b3f057c3b29c932cfaa60a11b37757dc assets/superbwarfare/models/item/dps_generator_deployer.json dd455cf29eed0ef5eb5e90ef3d7140cb8de61efe assets/superbwarfare/models/item/drone.json @@ -50,7 +53,10 @@ b6f96946b54f44fdd2d8b809945b8d1ae5e776e2 assets/superbwarfare/models/item/firing c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.json 5326409e01ffd1f0a6330299799994e267db2b6b assets/superbwarfare/models/item/galena.json 4bf506de247afbbec816f6637030f637e68ce0d4 assets/superbwarfare/models/item/ge_helmet_m_35.json +59322dfc0e0a28d793ed3603ed2084a5ac045206 assets/superbwarfare/models/item/glock_17.json +d842316fc4b25c17889fca4f89539d9e0829cda1 assets/superbwarfare/models/item/glock_17_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_17_blueprint.json +eb7c2404c141dde965b8cb13c1e368eab6a8fa16 assets/superbwarfare/models/item/glock_17_icon.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_18_blueprint.json 8752c2b2b648ff23d6b93eedcc6c0500c695afd7 assets/superbwarfare/models/item/grain.json c256914755344645319528b6abfabb6179f75052 assets/superbwarfare/models/item/handgun_ammo.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/devotion.json b/src/generated/resources/assets/superbwarfare/models/item/devotion.json new file mode 100644 index 000000000..8f7202ed9 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/devotion.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/devotion_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/devotion" + }, + "ground": { + "parent": "superbwarfare:lod/devotion" + }, + "gui": { + "parent": "superbwarfare:item/devotion_icon" + }, + "head": { + "parent": "superbwarfare:lod/devotion" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/devotion" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/devotion" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/devotion_base.json b/src/generated/resources/assets/superbwarfare/models/item/devotion_base.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/devotion_base.json rename to src/generated/resources/assets/superbwarfare/models/item/devotion_base.json diff --git a/src/main/resources/assets/superbwarfare/models/item/devotion_icon.json b/src/generated/resources/assets/superbwarfare/models/item/devotion_icon.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/devotion_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/devotion_icon.json index 953445bd7..fa413db2a 100644 --- a/src/main/resources/assets/superbwarfare/models/item/devotion_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/devotion_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/devotion_icon" } diff --git a/src/generated/resources/assets/superbwarfare/models/item/glock_17.json b/src/generated/resources/assets/superbwarfare/models/item/glock_17.json new file mode 100644 index 000000000..5058e334d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/glock_17.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/glock_17_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/glock_17" + }, + "ground": { + "parent": "superbwarfare:lod/glock_17" + }, + "gui": { + "parent": "superbwarfare:item/glock_17_icon" + }, + "head": { + "parent": "superbwarfare:lod/glock_17" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/glock_17" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/glock_17" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/glock_17_base.json b/src/generated/resources/assets/superbwarfare/models/item/glock_17_base.json new file mode 100644 index 000000000..1fc2306ff --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/glock_17_base.json @@ -0,0 +1,6 @@ +{ + "parent": "superbwarfare:displaysettings/glock_17.item", + "textures": { + "layer0": "superbwarfare:item/glock_17" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/glock_17_icon.json b/src/generated/resources/assets/superbwarfare/models/item/glock_17_icon.json new file mode 100644 index 000000000..e09773781 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/glock_17_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/glock_17_icon" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java index a95f15331..092f92c3b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java @@ -23,17 +23,17 @@ public class Glock17ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Glock17Item animatable) { - return Mod.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock_17.animation.json"); } @Override public ResourceLocation getModelResource(Glock17Item animatable) { - return Mod.loc("geo/glock17.geo.json"); + return Mod.loc("geo/glock_17.geo.json"); } @Override public ResourceLocation getTextureResource(Glock17Item animatable) { - return Mod.loc("textures/item/glock17.png"); + return Mod.loc("textures/item/glock_17.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java index daf3b71ec..cc8b198e8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java @@ -24,7 +24,7 @@ public class Glock18ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Glock18Item animatable) { - return Mod.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock_17.animation.json"); } @Override @@ -34,7 +34,7 @@ public class Glock18ItemModel extends GeoModel { @Override public ResourceLocation getTextureResource(Glock18Item animatable) { - return Mod.loc("textures/item/glock17.png"); + return Mod.loc("textures/item/glock_17.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java index 37dc79c17..92aa903c2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java @@ -23,7 +23,7 @@ public class M1911ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M1911Item animatable) { - return Mod.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock_17.animation.json"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java index 4404d9690..574b54701 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java @@ -23,7 +23,7 @@ public class Mp443ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Mp443Item animatable) { - return Mod.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock_17.animation.json"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index fda15e03a..345c8fb0f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -32,6 +32,8 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.AK_47); gunItem(ModItems.AURELIA_SCEPTRE); gunItem(ModItems.BOCEK); + gunItem(ModItems.DEVOTION); + gunItem(ModItems.GLOCK_17); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java index 08c03e6a6..83316e12f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java @@ -44,15 +44,15 @@ public class Glock17Item extends GunItem implements GeoItem { if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; if (GunData.from(stack).reload.empty()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_empty")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock_17.reload_empty")); } if (GunData.from(stack).reload.normal()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock_17.reload_normal")); } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle")); } private PlayState idlePredicate(AnimationState event) { @@ -65,13 +65,13 @@ public class Glock17Item extends GunItem implements GeoItem { && ClientEventHandler.cantSprint == 0 && !(GunData.from(stack).reload.normal() || GunData.from(stack).reload.empty()) && ClientEventHandler.drawTime < 0.01) { if (ClientEventHandler.tacticalSprint) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle")); } @Override @@ -94,7 +94,7 @@ public class Glock17Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return Mod.loc("textures/gun_icon/glock_icon.png"); + return Mod.loc("textures/gun_icon/glock_17_icon.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java index 22b65fc2b..7a7134825 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java @@ -96,7 +96,7 @@ public class Glock18Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return Mod.loc("textures/gun_icon/glock_icon.png"); + return Mod.loc("textures/gun_icon/glock_17_icon.png"); } @Override diff --git a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json b/src/main/resources/assets/superbwarfare/animations/glock_17.animation.json similarity index 99% rename from src/main/resources/assets/superbwarfare/animations/glock17.animation.json rename to src/main/resources/assets/superbwarfare/animations/glock_17.animation.json index d7bfd4097..b1e000eb9 100644 --- a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/glock_17.animation.json @@ -1,11 +1,11 @@ { "format_version": "1.8.0", "animations": { - "animation.glock.idle": { + "animation.glock_17.idle": { "loop": true, "animation_length": 2 }, - "animation.glock.run": { + "animation.glock_17.run": { "loop": true, "animation_length": 0.6, "bones": { @@ -173,7 +173,7 @@ } } }, - "animation.glock.run_fast": { + "animation.glock_17.run_fast": { "loop": true, "animation_length": 0.6, "bones": { @@ -345,7 +345,7 @@ } } }, - "animation.glock.reload_normal": { + "animation.glock_17.reload_normal": { "loop": "hold_on_last_frame", "animation_length": 2.25, "bones": { @@ -709,7 +709,7 @@ } } }, - "animation.glock.reload_empty": { + "animation.glock_17.reload_empty": { "loop": "hold_on_last_frame", "animation_length": 2.65, "bones": { diff --git a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json b/src/main/resources/assets/superbwarfare/geo/glock_17.geo.json similarity index 99% rename from src/main/resources/assets/superbwarfare/geo/glock17.geo.json rename to src/main/resources/assets/superbwarfare/geo/glock_17.geo.json index 05d117087..21846decd 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock_17.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.glock17", + "identifier": "geometry.glock_17", "texture_width": 64, "texture_height": 64, "visible_bounds_width": 126, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/glock_17.item.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json rename to src/main/resources/assets/superbwarfare/models/displaysettings/glock_17.item.json diff --git a/src/main/resources/assets/superbwarfare/models/item/devotion.json b/src/main/resources/assets/superbwarfare/models/item/devotion.json deleted file mode 100644 index c054c822b..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/devotion.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/devotion_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/devotion_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/devotion3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/devotion3d" - }, - "ground": { - "parent": "superbwarfare:item/devotion3d" - }, - "fixed": { - "parent": "superbwarfare:item/devotion3d" - }, - "head": { - "parent": "superbwarfare:item/devotion3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/glock17_icon.json b/src/main/resources/assets/superbwarfare/models/item/glock17_icon.json deleted file mode 100644 index 0cbe82479..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/glock17_icon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/glock17_icon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/glock_17.json b/src/main/resources/assets/superbwarfare/models/item/glock_17.json deleted file mode 100644 index b9b01cb4c..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/glock_17.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/glock_17_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/glock17_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/glock17_3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/glock17_3d" - }, - "ground": { - "parent": "superbwarfare:item/glock17_3d" - }, - "fixed": { - "parent": "superbwarfare:item/glock17_3d" - }, - "head": { - "parent": "superbwarfare:item/glock17_3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/glock_17_base.json b/src/main/resources/assets/superbwarfare/models/item/glock_17_base.json deleted file mode 100644 index e45180174..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/glock_17_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "superbwarfare:displaysettings/glock17.item", - "textures": { - "layer0": "superbwarfare:item/glock17" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/devotion3d.json b/src/main/resources/assets/superbwarfare/models/lod/devotion.json similarity index 99% rename from src/main/resources/assets/superbwarfare/models/item/devotion3d.json rename to src/main/resources/assets/superbwarfare/models/lod/devotion.json index 145732317..f721583b0 100644 --- a/src/main/resources/assets/superbwarfare/models/item/devotion3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/devotion.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "superbwarfare:item/devotion3d", - "particle": "superbwarfare:item/devotion3d" + "0": "superbwarfare:item/lod/devotion", + "particle": "superbwarfare:item/lod/devotion" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/models/item/glock17_3d.json b/src/main/resources/assets/superbwarfare/models/lod/glock_17.json similarity index 97% rename from src/main/resources/assets/superbwarfare/models/item/glock17_3d.json rename to src/main/resources/assets/superbwarfare/models/lod/glock_17.json index ad4d746ce..1bc8f2713 100644 --- a/src/main/resources/assets/superbwarfare/models/item/glock17_3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/glock_17.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "superbwarfare:item/glock17_3d", - "particle": "superbwarfare:item/glock17_3d" + "0": "superbwarfare:item/lod/glock_17", + "particle": "superbwarfare:item/lod/glock_17" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/glock_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/glock_17_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/gun_icon/glock_icon.png rename to src/main/resources/assets/superbwarfare/textures/gun_icon/glock_17_icon.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/glock17.png b/src/main/resources/assets/superbwarfare/textures/item/glock_17.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/glock17.png rename to src/main/resources/assets/superbwarfare/textures/item/glock_17.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/glock17_icon.png b/src/main/resources/assets/superbwarfare/textures/item/glock_17_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/glock17_icon.png rename to src/main/resources/assets/superbwarfare/textures/item/glock_17_icon.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/devotion3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/devotion.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/devotion3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/devotion.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/glock17_3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/glock_17.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/glock17_3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/glock_17.png