diff --git a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java index 398cede57..9471c90cc 100644 --- a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java @@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.Mod; @Mod.EventBusSubscriber(value = Dist.CLIENT) public class AmmoBarOverlay { - private static final ResourceLocation BUTTON = new ResourceLocation(TargetMod.MODID, "textures/gun_icon/fire_mode/button.png"); +// private static final ResourceLocation BUTTON = new ResourceLocation(TargetMod.MODID, "textures/gun_icon/fire_mode/button.png"); private static final ResourceLocation LINE = new ResourceLocation(TargetMod.MODID, "textures/gun_icon/fire_mode/line.png"); private static final ResourceLocation SEMI = new ResourceLocation(TargetMod.MODID, "textures/gun_icon/fire_mode/semi.png"); private static final ResourceLocation BURST = new ResourceLocation(TargetMod.MODID, "textures/gun_icon/fire_mode/burst.png"); @@ -51,22 +51,22 @@ public class AmmoBarOverlay { 16); // 渲染开火模式切换按键 - event.getGuiGraphics().blit(BUTTON, - w - 115, - h - 20, - 0, - 0, - 10, - 10, - 10, - 10); +// event.getGuiGraphics().blit(BUTTON, +// w - 115, +// h - 20, +// 0, +// 0, +// 10, +// 10, +// 10, +// 10); event.getGuiGraphics().drawString( Minecraft.getInstance().font, - TargetModKeyMappings.FIREMODE.getKey().getDisplayName().getString(), + "[" + TargetModKeyMappings.FIREMODE.getKey().getDisplayName().getString() + "]", w - 111.5f, h - 20, - 0x050505, + 0xFFFFFF, false ); @@ -74,8 +74,8 @@ public class AmmoBarOverlay { ResourceLocation fireMode = getFireMode(stack); event.getGuiGraphics().blit(fireMode, - w - 100, - h - 19, + w - 95, + h - 21, 0, 0, 8, @@ -84,8 +84,8 @@ public class AmmoBarOverlay { 8); event.getGuiGraphics().blit(LINE, - w - 100, - h - 14, + w - 95, + h - 16, 0, 0, 8, @@ -101,8 +101,8 @@ public class AmmoBarOverlay { event.getGuiGraphics().drawString( Minecraft.getInstance().font, getGunAmmoCount(player) + "", - w / 1.5f - 62 / 1.5f + 1, - h / 1.5f - 31, + w / 1.5f - 64 / 1.5f + 1, + h / 1.5f - 32, 0xFFFFFF, true ); @@ -112,21 +112,21 @@ public class AmmoBarOverlay { event.getGuiGraphics().drawString( Minecraft.getInstance().font, getPlayerAmmoCount(player), - w - 60, + w - 64, h - 35, 0xCCCCCC, true ); poseStack.pushPose(); - poseStack.scale(0.9f, 0.9f, 1f); + poseStack.scale(0.9f, 1f, 1f); // 渲染物品名称 event.getGuiGraphics().drawString( Minecraft.getInstance().font, centerString(gunItem.getGunDisplayName(), 20), - w / 0.9f - 128 / 0.9f, - h - 34, + w / 0.9f - 144 / 0.9f, + h - 60, 0xFFFFFF, true ); @@ -135,8 +135,8 @@ public class AmmoBarOverlay { event.getGuiGraphics().drawString( Minecraft.getInstance().font, centerString(getGunAmmoType(stack), 20), - w / 0.9f - 128 / 0.9f, - h - 26, + w / 0.9f - 144 / 0.9f, + h - 51, 0xC8A679, true ); @@ -156,10 +156,6 @@ public class AmmoBarOverlay { private static int getGunAmmoCount(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.getItem() == TargetModItems.BOCEK.get() || stack.getItem() == TargetModItems.M_79.get() - || stack.getItem() == TargetModItems.RPG.get() || stack.getItem() == TargetModItems.TASER.get()) { - return stack.getOrCreateTag().getInt("max_ammo"); - } if (stack.getItem() == TargetModItems.MINIGUN.get()) { return (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo; } @@ -174,6 +170,11 @@ public class AmmoBarOverlay { return ""; } + if (stack.getItem() == TargetModItems.BOCEK.get() || stack.getItem() == TargetModItems.M_79.get() + || stack.getItem() == TargetModItems.RPG.get() || stack.getItem() == TargetModItems.TASER.get()) { + return "" + stack.getOrCreateTag().getInt("max_ammo"); + } + if (stack.is(TargetModTags.Items.RIFLE)) { return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo; } @@ -191,7 +192,19 @@ public class AmmoBarOverlay { private static String getGunAmmoType(ItemStack stack) { if (stack.getItem() == TargetModItems.BOCEK.get()) { - return "Arrow"; + return " Arrow"; + } + + if (stack.getItem() == TargetModItems.M_79.get()) { + return "40mm Grenade"; + } + + if (stack.getItem() == TargetModItems.RPG.get()) { + return "Yassin105 TBG"; + } + + if (stack.getItem() == TargetModItems.TASER.get()) { + return "Electrode Rod"; } if (stack.getItem() == TargetModItems.MINIGUN.get()) { @@ -199,7 +212,7 @@ public class AmmoBarOverlay { } if (stack.is(TargetModTags.Items.RIFLE)) { - return "Rifle Ammo"; + return " Rifle Ammo"; } if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { return "Handgun Ammo"; diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index b132d50e1..d18c7d8b0 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -195,6 +195,6 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "AK-47"; + return " AK-47"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index e2a31996f..9b468d7fb 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -200,6 +200,6 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "AA-12"; + return " AA-12"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index 975939494..52644dcf0 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -186,6 +186,6 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "Abekiri"; + return " Abekiri"; } } diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index 3c2809506..ba7f0a178 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -190,6 +190,6 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "Bocek"; + return " Bocek"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index 09de17ab2..a04cc6147 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -243,6 +243,6 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "Devotion"; + return " Devotion"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index 541b1e3a1..28aaa9608 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -195,6 +195,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "HK416"; + return " HK-416"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index 2e52512c0..af0b5a360 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -218,6 +218,6 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "Hunting Rifle"; + return " Hunting Rifle"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index fbb998f35..1caac014b 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -195,6 +195,6 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "M4A1"; + return " M4A1"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index b1877868c..52cdef2c5 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -199,6 +199,6 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "M60"; + return " M60"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index 9f59edba3..ce94431d8 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -204,6 +204,6 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "M870 MCS"; + return " M870 MCS"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index ca9d831b8..e366c5971 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -195,6 +195,6 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "M98-B"; + return " M98-B"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java index f58c542d1..8191e5e13 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -211,6 +211,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "MARLIN 1895"; + return " MARLIN-1895"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index 1618bb8aa..98fbe5e3a 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -195,6 +195,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "MK-14EBR"; + return " MK-14"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 1de5d1e1a..8fc36e57c 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -202,6 +202,6 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "RPG-7"; + return " RPG-7"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index e9c208658..3d1d627b9 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -195,6 +195,6 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "RPK"; + return " RPK"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 3260e3772..644faf9b6 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -187,6 +187,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "SKS"; + return " SKS"; } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 3c0020898..c432a5263 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -188,6 +188,6 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { @Override public String getGunDisplayName() { - return "SVD"; + return " SVD"; } } \ No newline at end of file diff --git a/src/main/resources/assets/target/textures/gun_icon/aa_12_icon.png b/src/main/resources/assets/target/textures/gun_icon/aa_12_icon.png index 21d68ff29..0d89c50ee 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/aa_12_icon.png and b/src/main/resources/assets/target/textures/gun_icon/aa_12_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png b/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png index 750c4ad8d..db43a2a61 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png and b/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png b/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png index 8e913c852..084fe2b31 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png and b/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png b/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png index 6e05510ce..efbcf2ddb 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png and b/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/fire_mode/auto.png b/src/main/resources/assets/target/textures/gun_icon/fire_mode/auto.png index aceed771b..4a8e782fb 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/fire_mode/auto.png and b/src/main/resources/assets/target/textures/gun_icon/fire_mode/auto.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/fire_mode/burst.png b/src/main/resources/assets/target/textures/gun_icon/fire_mode/burst.png index 0923e0c25..455f5373b 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/fire_mode/burst.png and b/src/main/resources/assets/target/textures/gun_icon/fire_mode/burst.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/fire_mode/line.png b/src/main/resources/assets/target/textures/gun_icon/fire_mode/line.png index b06d135d2..bfca0b146 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/fire_mode/line.png and b/src/main/resources/assets/target/textures/gun_icon/fire_mode/line.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/fire_mode/semi.png b/src/main/resources/assets/target/textures/gun_icon/fire_mode/semi.png index 9baaeb32b..c345489fa 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/fire_mode/semi.png and b/src/main/resources/assets/target/textures/gun_icon/fire_mode/semi.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png b/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png index f374b3ce3..30057f735 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png and b/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png b/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png index 53ab98e41..91be4afd4 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png and b/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/m4_icon.png b/src/main/resources/assets/target/textures/gun_icon/m4_icon.png index 6adf779ce..74b329db0 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/m4_icon.png and b/src/main/resources/assets/target/textures/gun_icon/m4_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/m79_icon.png b/src/main/resources/assets/target/textures/gun_icon/m79_icon.png index b3a679482..06030a3f6 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/m79_icon.png and b/src/main/resources/assets/target/textures/gun_icon/m79_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/m870_icon.png b/src/main/resources/assets/target/textures/gun_icon/m870_icon.png index 5766660b9..991fa331a 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/m870_icon.png and b/src/main/resources/assets/target/textures/gun_icon/m870_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png b/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png index f67dd5321..2604c6c97 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png and b/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png b/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png index e547b8248..1f5b7e642 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png and b/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png b/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png index c3b62e96e..af2d9a6f7 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png and b/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png b/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png index 53fec9047..91f0238e0 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png and b/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/taser_icon.png b/src/main/resources/assets/target/textures/gun_icon/taser_icon.png index 2450a0cfa..6bf4369c2 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/taser_icon.png and b/src/main/resources/assets/target/textures/gun_icon/taser_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png b/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png index da0817240..ab6cdc14c 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png and b/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png differ diff --git a/src/main/resources/assets/target/textures/gun_icon/vector_icon.png b/src/main/resources/assets/target/textures/gun_icon/vector_icon.png index 0bc1a785d..60ef3d455 100644 Binary files a/src/main/resources/assets/target/textures/gun_icon/vector_icon.png and b/src/main/resources/assets/target/textures/gun_icon/vector_icon.png differ