diff --git a/src/generated/resources/assets/superbwarfare/models/item/rpg.json b/src/generated/resources/assets/superbwarfare/models/item/rpg.json new file mode 100644 index 000000000..b2defc616 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/rpg.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/rpg_base" + }, + "gui_light": "front", + "loader": "forge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/rpg" + }, + "ground": { + "parent": "superbwarfare:lod/rpg" + }, + "gui": { + "parent": "superbwarfare:item/rpg_icon" + }, + "head": { + "parent": "superbwarfare:lod/rpg" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/rpg" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/rpg" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/rpg_base.json b/src/generated/resources/assets/superbwarfare/models/item/rpg_base.json similarity index 65% rename from src/main/resources/assets/superbwarfare/models/item/rpg_base.json rename to src/generated/resources/assets/superbwarfare/models/item/rpg_base.json index 8ad8d689f..7d6834211 100644 --- a/src/main/resources/assets/superbwarfare/models/item/rpg_base.json +++ b/src/generated/resources/assets/superbwarfare/models/item/rpg_base.json @@ -1,6 +1,6 @@ { "parent": "superbwarfare:displaysettings/rpg.item", "textures": { - "layer0": "superbwarfare:item/rpg7" + "layer0": "superbwarfare:item/rpg" } } \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/rpg_icon.json b/src/generated/resources/assets/superbwarfare/models/item/rpg_icon.json new file mode 100644 index 000000000..3e4cfca21 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/rpg_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/rpg_icon" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java index 32727c24f..78bb2437d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java @@ -29,7 +29,7 @@ public class RpgItemModel extends CustomGunModel { @Override public ResourceLocation getTextureResource(RpgItem animatable) { - return Mod.loc("textures/item/rpg7.png"); + return Mod.loc("textures/item/rpg.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 33b0dfca8..cc5f2938a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -54,6 +54,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.MP_443); gunItem(ModItems.NTW_20); gunItem(ModItems.QBZ_95); + gunItem(ModItems.RPG); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/item/rpg.json b/src/main/resources/assets/superbwarfare/models/item/rpg.json deleted file mode 100644 index 508d3e86a..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/rpg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/rpg_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/rpg_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/rpg3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/rpg3d" - }, - "ground": { - "parent": "superbwarfare:item/rpg3d" - }, - "fixed": { - "parent": "superbwarfare:item/rpg3d" - }, - "head": { - "parent": "superbwarfare:item/rpg3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/rpg_icon.json b/src/main/resources/assets/superbwarfare/models/item/rpg_icon.json deleted file mode 100644 index ec4b92bf8..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/rpg_icon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/rpgicon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/rpg3d.json b/src/main/resources/assets/superbwarfare/models/lod/rpg.json similarity index 98% rename from src/main/resources/assets/superbwarfare/models/item/rpg3d.json rename to src/main/resources/assets/superbwarfare/models/lod/rpg.json index bee0cd8c1..3094950b2 100644 --- a/src/main/resources/assets/superbwarfare/models/item/rpg3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/rpg.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "2": "superbwarfare:item/rpg3d", - "particle": "superbwarfare:item/rpg3d" + "2": "superbwarfare:item/lod/rpg", + "particle": "superbwarfare:item/lod/rpg" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/rpg3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/rpg.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/rpg3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/rpg.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/rpg7.png b/src/main/resources/assets/superbwarfare/textures/item/rpg.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/rpg7.png rename to src/main/resources/assets/superbwarfare/textures/item/rpg.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/rpgicon.png b/src/main/resources/assets/superbwarfare/textures/item/rpg_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/rpgicon.png rename to src/main/resources/assets/superbwarfare/textures/item/rpg_icon.png