kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

添加了发射器的tag

Browse source
This commit is contained in:
17146 2024-09-26 10:54:48 +08:00
parent c263c5ce2e
commit 5b24ae40a3
6 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841
View file

@ -1,4 +1,4 @@
// 1.20.1 2024-09-12T20:35:10.8102487 Tags for minecraft:item mod id superbwarfare
// 1.20.1 2024-09-26T10:52:55.796428 Tags for minecraft:item mod id superbwarfare
cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json
0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json
295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json
@ -28,6 +28,7 @@ af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/le
144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json
99a5a3a4bb6b5fb641dcd449937365ea174f3797 data/superbwarfare/tags/items/gun.json
62eb408544731ce4cfcd119d8a6cc74731189ac0 data/superbwarfare/tags/items/handgun.json
68ec25b0ccd68abbbe2f33ab7097572c2140c9da data/superbwarfare/tags/items/launcher.json
b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json
4dc20b4a6b2978aba06811a61d1a8e693e1f7b04 data/superbwarfare/tags/items/normal_gun.json
2885fc6c956890f0134e4e015e989dc1c9c1e86d data/superbwarfare/tags/items/open_bolt.json

7
src/generated/resources/data/superbwarfare/tags/items/launcher.json Normal file
View file

@ -0,0 +1,7 @@
{
"values": [
"superbwarfare:m_79",
"superbwarfare:rpg",
"superbwarfare:javelin"
]
}

9
src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java
View file

@ -198,10 +198,9 @@ public class AmmoBarOverlay {
}
if (!creativeAmmo()) {
if (stack.getItem() == ModItems.M_79.get() || stack.getItem() == ModItems.RPG.get() || stack.getItem() == ModItems.TASER.get() || stack.getItem() == ModItems.JAVELIN.get() ) {
if (stack.is(ModTags.Items.LAUNCHER) || stack.getItem() == ModItems.TASER.get()) {
return "" + stack.getOrCreateTag().getInt("max_ammo");
}
if (stack.is(ModTags.Items.USE_RIFLE_AMMO)) {
return "" + (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).rifleAmmo;
}
@ -224,27 +223,21 @@ public class AmmoBarOverlay {
if (stack.getItem() == ModItems.BOCEK.get()) {
return " Arrow";
}
if (stack.getItem() == ModItems.M_79.get()) {
return "40mm Grenade";
}
if (stack.getItem() == ModItems.RPG.get()) {
return "Yassin105 TBG";
}
if (stack.getItem() == ModItems.JAVELIN.get()) {
return "Javelin Missile";
}
if (stack.getItem() == ModItems.TASER.get()) {
return "Electrode Rod";
}
if (stack.getItem() == ModItems.MINIGUN.get()) {
return "Rifle Ammo";
}
if (stack.is(ModTags.Items.USE_RIFLE_AMMO)) {
return " Rifle Ammo";
}

1
src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java
View file

@ -85,6 +85,7 @@ public class ModItemTagProvider extends ItemTagsProvider {
this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get());
this.tag(ModTags.Items.USE_SNIPER_AMMO).add(ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.SENTINEL.get(),
ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get());
this.tag(ModTags.Items.LAUNCHER).add(ModItems.M_79.get(), ModItems.RPG.get(), ModItems.JAVELIN.get());
}
private static TagKey<Item> forgeTag(String name) {

6
src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java
View file

@ -66,11 +66,7 @@ public class LivingEventHandler {
ItemStack stack = sourceentity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY;
if ((damageSource.is(ModDamageTypes.PROJECTILE_BOOM)
|| damageSource.is(ModDamageTypes.CANNON_FIRE))
&& (stack.getItem() == ModItems.M_79.get()
|| stack.getItem() == ModItems.RPG.get()
|| stack.getItem() == ModItems.JAVELIN.get())) {
if ((damageSource.is(ModDamageTypes.PROJECTILE_BOOM) || damageSource.is(ModDamageTypes.CANNON_FIRE)) && stack.is(ModTags.Items.LAUNCHER)) {
stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage);
}

1
src/main/java/net/mcreator/superbwarfare/init/ModTags.java
View file

@ -24,6 +24,7 @@ public class ModTags {
public static final TagKey<Item> SNIPER_RIFLE = tag("sniper_rifle");
public static final TagKey<Item> MACHINE_GUN = tag("machine_gun");
public static final TagKey<Item> SHOTGUN = tag("shotgun");
public static final TagKey<Item> LAUNCHER = tag("launcher");
public static final TagKey<Item> NORMAL_GUN = tag("normal_gun");
public static final TagKey<Item> OPEN_BOLT = tag("open_bolt");