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

补全了武器初始数值

Browse source
This commit is contained in:
17146 2024-05-10 14:48:24 +08:00
parent f2cdca4131
commit 049c34edd5
20 changed files with 51 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/mcreator/target/event/GunEventHandler.java
View file

@ -6,7 +6,6 @@ import net.mcreator.target.init.TargetModAttributes;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.init.TargetModTags; import net.mcreator.target.init.TargetModTags;
import net.mcreator.target.network.TargetModVariables; import net.mcreator.target.network.TargetModVariables;
import net.mcreator.target.tools.ItemNBTTool;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.network.protocol.game.ClientboundSoundPacket; import net.minecraft.network.protocol.game.ClientboundSoundPacket;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
@ -110,16 +109,14 @@ public class GunEventHandler {
if (stack.is(TargetModTags.Items.NORMAL_MAG_GUN)) { if (stack.is(TargetModTags.Items.NORMAL_MAG_GUN)) {
double mode = stack.getOrCreateTag().getDouble("firemode"); double mode = stack.getOrCreateTag().getDouble("firemode");
if (player.getPersistentData().getDouble("firing") == 0 && player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) { if (player.getPersistentData().getDouble("firing") == 0 && player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) {
stack.getOrCreateTag().putDouble("fire_increase", 0); stack.getOrCreateTag().putDouble("fire_increase", 0);
} }
if (player.getPersistentData().getDouble("firing") == 1 if (player.getPersistentData().getDouble("firing") == 1
&& stack.getOrCreateTag().getDouble("reloading") == 0 && stack.getOrCreateTag().getDouble("reloading") == 0
&& stack.getOrCreateTag().getDouble("ammo") > 0 && stack.getOrCreateTag().getDouble("ammo") > 0
&& !player.getCooldowns().isOnCooldown(stack.getItem()) && !player.getCooldowns().isOnCooldown(stack.getItem())
&& mode != 1 && mode != 1) {
&& !player.getCooldowns().isOnCooldown(stack.getItem()))
{
if (stack.getOrCreateTag().getDouble("firemode") == 0) { if (stack.getOrCreateTag().getDouble("firemode") == 0) {
player.getPersistentData().putDouble("firing", 0); player.getPersistentData().putDouble("firing", 0);
@ -149,7 +146,7 @@ public class GunEventHandler {
} }
if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) { if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) {
stack.getOrCreateTag().putDouble("fire_increase", stack.getOrCreateTag().getDouble("fire_increase") + 0.334); stack.getOrCreateTag().putDouble("fire_increase", stack.getOrCreateTag().getDouble("fire_increase") + 0.334);
} }
int cooldown = (int) stack.getOrCreateTag().getDouble("fire_interval") + (int) stack.getOrCreateTag().getDouble("fire_sequence") - (int) stack.getOrCreateTag().getDouble("fire_increase"); int cooldown = (int) stack.getOrCreateTag().getDouble("fire_interval") + (int) stack.getOrCreateTag().getDouble("fire_sequence") - (int) stack.getOrCreateTag().getDouble("fire_increase");

3
src/main/java/net/mcreator/target/item/gun/Devotion.java
View file

@ -2,6 +2,7 @@ package net.mcreator.target.item.gun;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.target.TargetMod;
import net.mcreator.target.client.renderer.item.DevotionItemRenderer; import net.mcreator.target.client.renderer.item.DevotionItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
@ -142,7 +143,7 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
if (slot == EquipmentSlot.MAINHAND) { if (slot == EquipmentSlot.MAINHAND) {
map = HashMultimap.create(map); map = HashMultimap.create(map);
map.put(Attributes.MOVEMENT_SPEED, map.put(Attributes.MOVEMENT_SPEED,
new AttributeModifier(uuid, "henghengaaa", -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE));
} }
return map; return map;
} }

7
src/main/java/net/mcreator/target/item/gun/Hk416Item.java
View file

@ -2,10 +2,12 @@ package net.mcreator.target.item.gun;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.target.TargetMod;
import net.mcreator.target.client.renderer.item.Hk416ItemRenderer; import net.mcreator.target.client.renderer.item.Hk416ItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -150,7 +152,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
if (slot == EquipmentSlot.MAINHAND) { if (slot == EquipmentSlot.MAINHAND) {
map = HashMultimap.create(map); map = HashMultimap.create(map);
map.put(Attributes.MOVEMENT_SPEED, map.put(Attributes.MOVEMENT_SPEED,
new AttributeModifier(uuid, "henghengaaa", -0.035f, AttributeModifier.Operation.MULTIPLY_BASE)); new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.035f, AttributeModifier.Operation.MULTIPLY_BASE));
} }
return map; return map;
} }
@ -168,8 +170,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.HK_416.get()); ItemStack stack = new ItemStack(TargetModItems.HK_416.get());
//GunsTool.initGun(stack, TargetModItems.HK_416.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.HK_416.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

7
src/main/java/net/mcreator/target/item/gun/HuntingRifle.java
View file

@ -2,10 +2,12 @@ package net.mcreator.target.item.gun;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.target.TargetMod;
import net.mcreator.target.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.target.client.renderer.item.HuntingRifleItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.HrrelodingProcedure; import net.mcreator.target.procedures.HrrelodingProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -136,7 +138,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
if (slot == EquipmentSlot.MAINHAND) { if (slot == EquipmentSlot.MAINHAND) {
map = HashMultimap.create(map); map = HashMultimap.create(map);
map.put(Attributes.MOVEMENT_SPEED, map.put(Attributes.MOVEMENT_SPEED,
new AttributeModifier(uuid, "henghengaaa", -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE));
} }
return map; return map;
} }
@ -154,8 +156,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.HUNTING_RIFLE.get()); ItemStack stack = new ItemStack(TargetModItems.HUNTING_RIFLE.get());
//GunsTool.initGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/Kraber.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.KraberItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.RarityTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -169,8 +170,7 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.KRABER.get()); ItemStack stack = new ItemStack(TargetModItems.KRABER.get());
//GunsTool.initGun(stack, TargetModItems.KRABER.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.KRABER.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/M4Item.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.M4ItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -169,8 +170,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.M_4.get()); ItemStack stack = new ItemStack(TargetModItems.M_4.get());
//GunsTool.initGun(stack, TargetModItems.M_4.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.M_4.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/M60Item.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.M60ItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -173,8 +174,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.M_60.get()); ItemStack stack = new ItemStack(TargetModItems.M_60.get());
//GunsTool.initGun(stack, TargetModItems.M_60.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.M_60.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

7
src/main/java/net/mcreator/target/item/gun/M79Item.java
View file

@ -2,10 +2,12 @@ package net.mcreator.target.item.gun;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.target.TargetMod;
import net.mcreator.target.client.renderer.item.M79ItemRenderer; import net.mcreator.target.client.renderer.item.M79ItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -137,7 +139,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
if (slot == EquipmentSlot.MAINHAND) { if (slot == EquipmentSlot.MAINHAND) {
map = HashMultimap.create(map); map = HashMultimap.create(map);
map.put(Attributes.MOVEMENT_SPEED, map.put(Attributes.MOVEMENT_SPEED,
new AttributeModifier(uuid, "henghengaaa", -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.07f, AttributeModifier.Operation.MULTIPLY_BASE));
} }
return map; return map;
} }
@ -173,8 +175,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.M_79.get()); ItemStack stack = new ItemStack(TargetModItems.M_79.get());
//GunsTool.initGun(stack, TargetModItems.M_79.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.M_79.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/M870Item.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.M870ItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -178,8 +179,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.M_870.get()); ItemStack stack = new ItemStack(TargetModItems.M_870.get());
//GunsTool.initGun(stack, TargetModItems.M_870.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.M_870.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

7
src/main/java/net/mcreator/target/item/gun/M98bItem.java
View file

@ -2,10 +2,12 @@ package net.mcreator.target.item.gun;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.target.TargetMod;
import net.mcreator.target.client.renderer.item.M98bItemRenderer; import net.mcreator.target.client.renderer.item.M98bItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -151,7 +153,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
if (slot == EquipmentSlot.MAINHAND) { if (slot == EquipmentSlot.MAINHAND) {
map = HashMultimap.create(map); map = HashMultimap.create(map);
map.put(Attributes.MOVEMENT_SPEED, map.put(Attributes.MOVEMENT_SPEED,
new AttributeModifier(uuid, "henghengaaa", -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.07f, AttributeModifier.Operation.MULTIPLY_BASE));
} }
return map; return map;
} }
@ -164,8 +166,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.M_98B.get()); ItemStack stack = new ItemStack(TargetModItems.M_98B.get());
//GunsTool.initGun(stack, TargetModItems.M_98B.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.M_98B.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/MarlinItem.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.MarlinItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -185,8 +186,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.MARLIN.get()); ItemStack stack = new ItemStack(TargetModItems.MARLIN.get());
//GunsTool.initGun(stack, TargetModItems.MARLIN.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.MARLIN.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/Minigun.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.MinigunItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.MiniguninbackpackProcedure; import net.mcreator.target.procedures.MiniguninbackpackProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.ItemNBTTool;
import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.RarityTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
@ -186,8 +187,7 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.MINIGUN.get()); ItemStack stack = new ItemStack(TargetModItems.MINIGUN.get());
//GunsTool.initGun(stack, TargetModItems.MINIGUN.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.MINIGUN.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/Mk14Item.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.Mk14ItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -169,8 +170,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.MK_14.get()); ItemStack stack = new ItemStack(TargetModItems.MK_14.get());
//GunsTool.initGun(stack, TargetModItems.MK_14.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.MK_14.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/RpgItem.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.RpgItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -176,8 +177,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.RPG.get()); ItemStack stack = new ItemStack(TargetModItems.RPG.get());
//GunsTool.initGun(stack, TargetModItems.RPG.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.RPG.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/RpkItem.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.RpkItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -169,8 +170,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.RPK.get()); ItemStack stack = new ItemStack(TargetModItems.RPK.get());
//GunsTool.initGun(stack, TargetModItems.RPK.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.RPK.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/SentinelItem.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.SentinelItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.ItemNBTTool;
import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.RarityTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -197,8 +198,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.SENTINEL.get()); ItemStack stack = new ItemStack(TargetModItems.SENTINEL.get());
//GunsTool.initGun(stack, TargetModItems.SENTINEL.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.SENTINEL.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

7
src/main/java/net/mcreator/target/item/gun/SksItem.java
View file

@ -2,10 +2,12 @@ package net.mcreator.target.item.gun;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.target.TargetMod;
import net.mcreator.target.client.renderer.item.SksItemRenderer; import net.mcreator.target.client.renderer.item.SksItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -142,7 +144,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
if (slot == EquipmentSlot.MAINHAND) { if (slot == EquipmentSlot.MAINHAND) {
map = HashMultimap.create(map); map = HashMultimap.create(map);
map.put(Attributes.MOVEMENT_SPEED, map.put(Attributes.MOVEMENT_SPEED,
new AttributeModifier(uuid, "henghengaaa", -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE));
} }
return map; return map;
} }
@ -160,8 +162,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.SKS.get()); ItemStack stack = new ItemStack(TargetModItems.SKS.get());
//GunsTool.initGun(stack, TargetModItems.SKS.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.SKS.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/SvdItem.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.SvdItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -162,8 +163,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.SVD.get()); ItemStack stack = new ItemStack(TargetModItems.SVD.get());
//GunsTool.initGun(stack, TargetModItems.SVD.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.SVD.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/Taser.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.TaserItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.TasercooldownProcedure; import net.mcreator.target.procedures.TasercooldownProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -175,8 +176,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.TASER.get()); ItemStack stack = new ItemStack(TargetModItems.TASER.get());
GunsTool.initCreativeGun(stack, TargetModItems.TASER.getId().getPath());
//GunsTool.initGun(stack, TargetModItems.TASER.getId().getPath());
return stack; return stack;
} }

4
src/main/java/net/mcreator/target/item/gun/VectorItem.java
View file

@ -7,6 +7,7 @@ import net.mcreator.target.client.renderer.item.VectorItemRenderer;
import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModItems;
import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.item.AnimatedItem;
import net.mcreator.target.procedures.VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.procedures.VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure;
import net.mcreator.target.tools.GunsTool;
import net.mcreator.target.tools.TooltipTool; import net.mcreator.target.tools.TooltipTool;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
@ -173,8 +174,7 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {
ItemStack stack = new ItemStack(TargetModItems.VECTOR.get()); ItemStack stack = new ItemStack(TargetModItems.VECTOR.get());
//GunsTool.initGun(stack, TargetModItems.VECTOR.getId().getPath()); GunsTool.initCreativeGun(stack, TargetModItems.VECTOR.getId().getPath());
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
return stack; return stack;
} }