From dc12d92fb713ef8dfab72b3d2d7d22f3d19220a0 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 27 Jul 2024 02:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mcreator/superbwarfare/ModUtils.java | 30 +- .../superbwarfare/block/JumpPadBlock.java | 6 +- .../superbwarfare/client/ClickHandler.java | 24 +- .../superbwarfare/client/layer/AK47Layer.java | 3 +- .../superbwarfare/client/layer/Aa12Layer.java | 3 +- .../client/layer/AbekiriLayer.java | 3 +- .../client/layer/BocekLayer.java | 3 +- .../client/layer/DevotionLayer.java | 3 +- .../client/layer/Hk416Layer.java | 3 +- .../client/layer/HuntingRifleLayer.java | 3 +- .../client/layer/LightSaberLayer.java | 3 +- .../superbwarfare/client/layer/M4Layer.java | 3 +- .../superbwarfare/client/layer/M60Layer.java | 3 +- .../superbwarfare/client/layer/M79Layer.java | 3 +- .../superbwarfare/client/layer/M870Layer.java | 3 +- .../superbwarfare/client/layer/M98bLayer.java | 3 +- .../client/layer/MarlinLayer.java | 3 +- .../client/layer/MinigunLayer.java | 3 +- .../superbwarfare/client/layer/Mk14Layer.java | 3 +- .../client/layer/Ntw20Layer.java | 3 +- .../superbwarfare/client/layer/RpgLayer.java | 3 +- .../superbwarfare/client/layer/RpkLayer.java | 3 +- .../client/layer/SentinelLayer.java | 3 +- .../superbwarfare/client/layer/SksLayer.java | 3 +- .../superbwarfare/client/layer/SvdLayer.java | 3 +- .../client/layer/TaserLayer.java | 3 +- .../client/layer/TaserLayer2.java | 3 +- .../client/layer/TracheliumLayer.java | 3 +- .../client/layer/VectorLayer.java | 3 +- .../client/model/entity/ModelBocekArrow.java | 3 +- .../client/model/entity/ModelBullet.java | 3 +- .../client/model/entity/ModelClaymore.java | 3 +- .../client/model/entity/ModelGrenade.java | 3 +- .../client/model/entity/ModelMissile.java | 3 +- .../client/model/entity/ModelMortarShell.java | 3 +- .../client/model/entity/ModelRPGRocket.java | 3 +- .../client/model/entity/ModelTaserRod.java | 3 +- .../client/model/item/AK47ItemModel.java | 11 +- .../client/model/item/Aa12ItemModel.java | 11 +- .../client/model/item/AbekiriItemModel.java | 11 +- .../client/model/item/BocekItemModel.java | 11 +- .../client/model/item/DevotionItemModel.java | 11 +- .../client/model/item/Hk416ItemModel.java | 11 +- .../model/item/HuntingRifleItemModel.java | 11 +- .../model/item/LightSaberItemModel.java | 7 +- .../client/model/item/M4ItemModel.java | 11 +- .../client/model/item/M60ItemModel.java | 11 +- .../client/model/item/M79ItemModel.java | 11 +- .../client/model/item/M870ItemModel.java | 11 +- .../client/model/item/M98bItemModel.java | 11 +- .../client/model/item/MarlinItemModel.java | 11 +- .../client/model/item/MinigunItemModel.java | 11 +- .../client/model/item/Mk14ItemModel.java | 11 +- .../client/model/item/Ntw20Model.java | 11 +- .../client/model/item/RocketItemModel.java | 7 +- .../client/model/item/RpgItemModel.java | 11 +- .../client/model/item/RpkItemModel.java | 11 +- .../client/model/item/SentinelItemModel.java | 11 +- .../client/model/item/SksItemModel.java | 11 +- .../client/model/item/SvdItemModel.java | 11 +- .../client/model/item/TaserItemModel.java | 11 +- .../model/item/TracheliumItemModel.java | 11 +- .../client/model/item/VectorItemModel.java | 11 +- .../client/renderer/entity/Mk42Renderer.java | 1 - .../client/screens/AmmoBarOverlay.java | 42 +- .../client/screens/CrossHairOverlay.java | 12 +- .../client/screens/DroneUIOverlay.java | 4 +- .../client/screens/KillMessageOverlay.java | 20 +- .../client/screens/M79UIOverlay.java | 4 +- .../enchantment/LongerWireEnchantment.java | 4 +- .../enchantment/SuperRechargeEnchantment.java | 4 +- .../enchantment/VoltOverloadEnchantment.java | 4 +- .../entity/BocekArrowEntity.java | 22 +- .../entity/CannonShellEntity.java | 12 +- .../superbwarfare/entity/ClaymoreEntity.java | 16 +- .../superbwarfare/entity/DroneEntity.java | 24 +- .../entity/DroneGrenadeEntity.java | 14 +- .../superbwarfare/entity/FragEntity.java | 18 +- .../entity/GunGrenadeEntity.java | 28 +- .../superbwarfare/entity/Mk42Entity.java | 28 +- .../superbwarfare/entity/MortarEntity.java | 28 +- .../entity/MortarShellEntity.java | 14 +- .../entity/ProjectileEntity.java | 30 +- .../superbwarfare/entity/RpgRocketEntity.java | 28 +- .../superbwarfare/entity/SenpaiEntity.java | 12 +- .../superbwarfare/entity/Target1Entity.java | 18 +- .../superbwarfare/entity/TargetEntity.java | 4 +- .../entity/TaserBulletProjectileEntity.java | 12 +- .../superbwarfare/entity/layer/Mk42Layer.java | 3 +- .../entity/layer/MortarLayer.java | 3 +- .../entity/layer/TargetLayer.java | 3 +- .../entity/model/ClaymoreModel.java | 7 +- .../entity/model/DroneModel.java | 7 +- .../superbwarfare/entity/model/Mk42Model.java | 7 +- .../entity/model/MortarModel.java | 7 +- .../entity/model/SenpaiModel.java | 7 +- .../entity/model/Target1Model.java | 7 +- .../entity/model/TargetModel.java | 7 +- .../event/ClientEventHandler.java | 28 +- .../superbwarfare/event/GunEventHandler.java | 136 +++---- .../event/LivingEventHandler.java | 36 +- .../event/PlayerEventHandler.java | 40 +- .../headshot/BoundingBoxManager.java | 6 +- ...tModAttributes.java => ModAttributes.java} | 4 +- .../{TargetModBlocks.java => ModBlocks.java} | 2 +- ...odDamageTypes.java => ModDamageTypes.java} | 2 +- ...Enchantments.java => ModEnchantments.java} | 2 +- ...argetModEntities.java => ModEntities.java} | 2 +- .../init/ModEntityRenderers.java | 30 ++ .../{TargetModItems.java => ModItems.java} | 22 +- ...odKeyMappings.java => ModKeyMappings.java} | 18 +- ...LootModifier.java => ModLootModifier.java} | 2 +- .../{TargetModMenus.java => ModMenus.java} | 2 +- ...tModMobEffects.java => ModMobEffects.java} | 2 +- .../{TargetModModels.java => ModModels.java} | 2 +- ...rticleTypes.java => ModParticleTypes.java} | 2 +- ...getModParticles.java => ModParticles.java} | 6 +- .../{TargetModPotion.java => ModPotion.java} | 14 +- ...tModProperties.java => ModProperties.java} | 4 +- ...{TargetModScreens.java => ModScreens.java} | 4 +- .../{TargetModSounds.java => ModSounds.java} | 360 +++++++++--------- .../init/{TargetModTabs.java => ModTabs.java} | 22 +- .../init/{TargetModTags.java => ModTags.java} | 2 +- .../{TargetModTrades.java => ModTrades.java} | 50 +-- .../init/TargetModEntityRenderers.java | 30 -- .../superbwarfare/item/ClaymoreMine.java | 4 +- .../mcreator/superbwarfare/item/Drone.java | 4 +- .../superbwarfare/item/MortarDeployer.java | 4 +- .../superbwarfare/item/TargetDeployer.java | 4 +- .../item/common/ammo/AmmoSupplierItem.java | 4 +- .../item/common/ammo/CreativeAmmoBox.java | 4 +- .../superbwarfare/item/gun/AK47Item.java | 14 +- .../superbwarfare/item/gun/Aa12Item.java | 14 +- .../superbwarfare/item/gun/Abekiri.java | 14 +- .../superbwarfare/item/gun/BocekItem.java | 10 +- .../superbwarfare/item/gun/Devotion.java | 14 +- .../superbwarfare/item/gun/GunItem.java | 14 +- .../superbwarfare/item/gun/Hk416Item.java | 14 +- .../superbwarfare/item/gun/HuntingRifle.java | 14 +- .../superbwarfare/item/gun/M4Item.java | 14 +- .../superbwarfare/item/gun/M60Item.java | 14 +- .../superbwarfare/item/gun/M79Item.java | 16 +- .../superbwarfare/item/gun/M870Item.java | 14 +- .../superbwarfare/item/gun/M98bItem.java | 18 +- .../superbwarfare/item/gun/MarlinItem.java | 14 +- .../superbwarfare/item/gun/Minigun.java | 10 +- .../superbwarfare/item/gun/Mk14Item.java | 14 +- .../superbwarfare/item/gun/Ntw20.java | 20 +- .../superbwarfare/item/gun/RpgItem.java | 16 +- .../superbwarfare/item/gun/RpkItem.java | 14 +- .../superbwarfare/item/gun/SentinelItem.java | 22 +- .../superbwarfare/item/gun/SksItem.java | 14 +- .../superbwarfare/item/gun/SvdItem.java | 14 +- .../superbwarfare/item/gun/Taser.java | 20 +- .../superbwarfare/item/gun/Trachelium.java | 14 +- .../superbwarfare/item/gun/VectorItem.java | 14 +- .../superbwarfare/mixins/CameraMixin.java | 4 +- .../mixins/GameRendererMixin.java | 4 +- .../mixins/ItemInHandLayerMixin.java | 4 +- .../superbwarfare/mixins/KeyMappingMixin.java | 8 +- .../mixins/LivingEntityMixin.java | 8 +- .../mixins/MouseHandlerMixin.java | 8 +- .../mobeffect/ShockMobEffect.java | 28 +- .../message/AdjustMortarAngleMessage.java | 10 +- .../network/message/AdjustZoomFovMessage.java | 8 +- .../network/message/DoubleJumpMessage.java | 6 +- .../network/message/DroneFireMessage.java | 4 +- .../network/message/DroneMovementMessage.java | 4 +- .../network/message/FireMessage.java | 64 ++-- .../network/message/FireModeMessage.java | 14 +- .../message/GunRecycleGuiButtonMessage.java | 22 +- .../network/message/InteractMessage.java | 8 +- .../network/message/ReloadMessage.java | 24 +- .../network/message/SensitivityMessage.java | 4 +- .../network/message/ZoomMessage.java | 16 +- .../tools/MissingMappingHandler.java | 136 +++++++ .../superbwarfare/tools/ParticleTool.java | 42 +- .../world/inventory/GunRecycleGuiMenu.java | 8 +- .../assets/superbwarfare/lang/en_us.json | 26 +- .../assets/superbwarfare/lang/zh_cn.json | 26 +- 180 files changed, 1409 insertions(+), 1202 deletions(-) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModAttributes.java => ModAttributes.java} (92%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModBlocks.java => ModBlocks.java} (97%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModDamageTypes.java => ModDamageTypes.java} (99%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModEnchantments.java => ModEnchantments.java} (97%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModEntities.java => ModEntities.java} (99%) create mode 100644 src/main/java/net/mcreator/superbwarfare/init/ModEntityRenderers.java rename src/main/java/net/mcreator/superbwarfare/init/{TargetModItems.java => ModItems.java} (95%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModKeyMappings.java => ModKeyMappings.java} (89%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModLootModifier.java => ModLootModifier.java} (98%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModMenus.java => ModMenus.java} (96%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModMobEffects.java => ModMobEffects.java} (94%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModModels.java => ModModels.java} (97%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModParticleTypes.java => ModParticleTypes.java} (95%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModParticles.java => ModParticles.java} (71%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModPotion.java => ModPotion.java} (61%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModProperties.java => ModProperties.java} (81%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModScreens.java => ModScreens.java} (82%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModSounds.java => ModSounds.java} (63%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModTabs.java => ModTabs.java} (83%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModTags.java => ModTags.java} (97%) rename src/main/java/net/mcreator/superbwarfare/init/{TargetModTrades.java => ModTrades.java} (57%) delete mode 100644 src/main/java/net/mcreator/superbwarfare/init/TargetModEntityRenderers.java create mode 100644 src/main/java/net/mcreator/superbwarfare/tools/MissingMappingHandler.java diff --git a/src/main/java/net/mcreator/superbwarfare/ModUtils.java b/src/main/java/net/mcreator/superbwarfare/ModUtils.java index 28fb655f5..f138b7443 100644 --- a/src/main/java/net/mcreator/superbwarfare/ModUtils.java +++ b/src/main/java/net/mcreator/superbwarfare/ModUtils.java @@ -40,16 +40,16 @@ public class ModUtils { public ModUtils() { IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus(); - TargetModSounds.REGISTRY.register(bus); - TargetModBlocks.REGISTRY.register(bus); - TargetModItems.register(bus); - TargetModEntities.REGISTRY.register(bus); - TargetModTabs.TABS.register(bus); - TargetModMobEffects.REGISTRY.register(bus); - TargetModParticleTypes.REGISTRY.register(bus); - TargetModPotion.POTIONS.register(bus); - TargetModMenus.REGISTRY.register(bus); - TargetModEnchantments.REGISTRY.register(bus); + ModSounds.REGISTRY.register(bus); + ModBlocks.REGISTRY.register(bus); + ModItems.register(bus); + ModEntities.REGISTRY.register(bus); + ModTabs.TABS.register(bus); + ModMobEffects.REGISTRY.register(bus); + ModParticleTypes.REGISTRY.register(bus); + ModPotion.POTIONS.register(bus); + ModMenus.REGISTRY.register(bus); + ModEnchantments.REGISTRY.register(bus); bus.addListener(this::onCommonSetup); @@ -110,10 +110,10 @@ public class ModUtils { addNetworkMessage(SimulationDistanceMessage.class, SimulationDistanceMessage::encode, SimulationDistanceMessage::decode, SimulationDistanceMessage::handle, Optional.of(NetworkDirection.PLAY_TO_CLIENT)); event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)), - Ingredient.of(Items.LIGHTNING_ROD), PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.SHOCK.get()))); - event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.SHOCK.get())), - Ingredient.of(Items.REDSTONE), PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.LONG_SHOCK.get()))); - event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.SHOCK.get())), - Ingredient.of(Items.GLOWSTONE_DUST), PotionUtils.setPotion(new ItemStack(Items.POTION), TargetModPotion.STRONG_SHOCK.get()))); + Ingredient.of(Items.LIGHTNING_ROD), PotionUtils.setPotion(new ItemStack(Items.POTION), ModPotion.SHOCK.get()))); + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), ModPotion.SHOCK.get())), + Ingredient.of(Items.REDSTONE), PotionUtils.setPotion(new ItemStack(Items.POTION), ModPotion.LONG_SHOCK.get()))); + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), ModPotion.SHOCK.get())), + Ingredient.of(Items.GLOWSTONE_DUST), PotionUtils.setPotion(new ItemStack(Items.POTION), ModPotion.STRONG_SHOCK.get()))); } } diff --git a/src/main/java/net/mcreator/superbwarfare/block/JumpPadBlock.java b/src/main/java/net/mcreator/superbwarfare/block/JumpPadBlock.java index 9742a1789..b6246c468 100644 --- a/src/main/java/net/mcreator/superbwarfare/block/JumpPadBlock.java +++ b/src/main/java/net/mcreator/superbwarfare/block/JumpPadBlock.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.block; import net.mcreator.superbwarfare.entity.Mk42Entity; import net.mcreator.superbwarfare.entity.Target1Entity; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -97,9 +97,9 @@ public class JumpPadBlock extends Block { } if (!level.isClientSide()) { - level.playSound(null, BlockPos.containing(pos.getX(), pos.getY(), pos.getZ()), TargetModSounds.JUMP.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, BlockPos.containing(pos.getX(), pos.getY(), pos.getZ()), ModSounds.JUMP.get(), SoundSource.BLOCKS, 1, 1); } else { - level.playLocalSound(pos.getX(), pos.getY(), pos.getZ(), TargetModSounds.JUMP.get(), SoundSource.BLOCKS, 1, 1, false); + level.playLocalSound(pos.getX(), pos.getY(), pos.getZ(), ModSounds.JUMP.get(), SoundSource.BLOCKS, 1, 1, false); } entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java index 3a422cde1..52cbd2603 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java @@ -4,9 +4,9 @@ import com.mojang.blaze3d.platform.InputConstants; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.Mk42Entity; import net.mcreator.superbwarfare.entity.MortarEntity; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModMobEffects; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModMobEffects; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.network.message.*; import net.mcreator.superbwarfare.tools.TraceTool; @@ -45,7 +45,7 @@ public class ClickHandler { ModUtils.PACKET_HANDLER.sendToServer(new VehicleFireMessage(1)); } if (button == GLFW.GLFW_MOUSE_BUTTON_RIGHT) { - if (Minecraft.getInstance().player.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (Minecraft.getInstance().player.hasEffect(ModMobEffects.SHOCK.get())) { event.setCanceled(true); } @@ -65,11 +65,11 @@ public class ClickHandler { int button = event.getButton(); if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) { - if (Minecraft.getInstance().player.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (Minecraft.getInstance().player.hasEffect(ModMobEffects.SHOCK.get())) { event.setCanceled(true); return; } - if (stack.is(TargetModItems.MONITOR.get())) { + if (stack.is(ModItems.MONITOR.get())) { event.setCanceled(true); ModUtils.PACKET_HANDLER.sendToServer(new DroneFireMessage(0)); } @@ -78,24 +78,24 @@ public class ClickHandler { ModUtils.PACKET_HANDLER.sendToServer(new VehicleFireMessage(0)); return; } - if (player.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (player.getMainHandItem().is(ModTags.Items.GUN)) { event.setCanceled(true); ModUtils.PACKET_HANDLER.sendToServer(new FireMessage(0)); } } if (button == GLFW.GLFW_MOUSE_BUTTON_RIGHT) { - if (Minecraft.getInstance().player.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (Minecraft.getInstance().player.hasEffect(ModMobEffects.SHOCK.get())) { event.setCanceled(true); } - if (player.getMainHandItem().is(TargetModTags.Items.GUN) || (player.isPassenger() && player.getVehicle() instanceof Mk42Entity)) { + if (player.getMainHandItem().is(ModTags.Items.GUN) || (player.isPassenger() && player.getVehicle() instanceof Mk42Entity)) { event.setCanceled(true); ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(0)); } } if (button == GLFW.GLFW_MOUSE_BUTTON_MIDDLE) { - if (Minecraft.getInstance().player.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (Minecraft.getInstance().player.hasEffect(ModMobEffects.SHOCK.get())) { event.setCanceled(true); } } @@ -112,7 +112,7 @@ public class ClickHandler { double scroll = event.getScrollDelta(); - if (stack.is(TargetModTags.Items.GUN) && (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) { + if (stack.is(ModTags.Items.GUN) && (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) { var tag = stack.getOrCreateTag(); if (tag.getDouble("min_zoom") != 0 && tag.getDouble("max_zoom") != 0) { ModUtils.PACKET_HANDLER.sendToServer(new AdjustZoomFovMessage(scroll)); @@ -120,7 +120,7 @@ public class ClickHandler { event.setCanceled(true); } - if (player.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (player.hasEffect(ModMobEffects.SHOCK.get())) { event.setCanceled(true); } diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java index 0ef892a0d..540f846d8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/AK47Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.AK47Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AK47Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/ak47_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/ak47_e.png"); public AK47Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Aa12Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Aa12Layer.java index 34d8955bd..5e9de5464 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Aa12Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Aa12Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Aa12Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Aa12Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/aa12_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/aa12_e.png"); public Aa12Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/AbekiriLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/AbekiriLayer.java index eb17f3e43..4f7e51f91 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/AbekiriLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/AbekiriLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Abekiri; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AbekiriLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/abekiri_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/abekiri_e.png"); public AbekiriLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/BocekLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/BocekLayer.java index 0b43b8a06..88b0ef5ff 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/BocekLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/BocekLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.BocekItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class BocekLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/bocek_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/bocek_e.png"); public BocekLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/DevotionLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/DevotionLayer.java index ba3b4b68f..1564408de 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/DevotionLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/DevotionLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Devotion; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class DevotionLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/devotion_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/devotion_e.png"); public DevotionLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java index 1537f2882..42e605049 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Hk416Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Hk416Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Hk416Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/hk416_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/hk416_e.png"); public Hk416Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/HuntingRifleLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/HuntingRifleLayer.java index 410ef7a18..55c70f709 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/HuntingRifleLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/HuntingRifleLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.HuntingRifle; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class HuntingRifleLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/huntingrifle_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/huntingrifle_e.png"); public HuntingRifleLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/LightSaberLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/LightSaberLayer.java index aafdd5555..2cce1749c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/LightSaberLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/LightSaberLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.LightSaber; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class LightSaberLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/lightsaber_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/lightsaber_e.png"); public LightSaberLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java index 032fef6d5..b4443c557 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/M4Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.M4Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M4Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/m4_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/m4_e.png"); public M4Layer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/M60Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/M60Layer.java index 763f5082f..a26f9914e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/M60Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/M60Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.M60Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M60Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/m60_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/m60_e.png"); public M60Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/M79Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/M79Layer.java index 1637cf250..9dce91041 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/M79Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/M79Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.M79Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M79Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/m79_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/m79_e.png"); public M79Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/M870Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/M870Layer.java index 5b25513e3..fb6d2c953 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/M870Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/M870Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.M870Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M870Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/m870_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/m870_e.png"); public M870Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/M98bLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/M98bLayer.java index 898ba0112..821c07c4a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/M98bLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/M98bLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.M98bItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M98bLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/m98b_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/m98b_e.png"); public M98bLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java index eacd08a6b..c91bb5a1e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/MarlinLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.MarlinItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MarlinLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/marlin_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/marlin_e.png"); public MarlinLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/MinigunLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/MinigunLayer.java index bab014eed..43a45416c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/MinigunLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/MinigunLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Minigun; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MinigunLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/minigun_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/minigun_e.png"); public MinigunLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java index 1dd233ac2..d1a9d6f9a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Mk14Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Mk14Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Mk14Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/mk14_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/mk14_e.png"); public Mk14Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/Ntw20Layer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/Ntw20Layer.java index b5f9b45ed..358ae0303 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/Ntw20Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/Ntw20Layer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Ntw20; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Ntw20Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/ntw_20_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/ntw_20_e.png"); public Ntw20Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/RpgLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/RpgLayer.java index f53081ead..1ca5bcceb 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/RpgLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/RpgLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.RpgItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class RpgLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/rpg7_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/rpg7_e.png"); public RpgLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/RpkLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/RpkLayer.java index 6a79943b4..833ab6002 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/RpkLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/RpkLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.RpkItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class RpkLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/rpk_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/rpk_e.png"); public RpkLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/SentinelLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/SentinelLayer.java index 358a3d70a..204bd5efe 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/SentinelLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/SentinelLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.SentinelItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SentinelLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/sentinel_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/sentinel_e.png"); public SentinelLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java index 4221ac28d..44f169c4d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/SksLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.SksItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SksLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/sks_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/sks_e.png"); public SksLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/SvdLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/SvdLayer.java index 0baa7f0d7..082410dfe 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/SvdLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/SvdLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.SvdItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SvdLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/svd_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/svd_e.png"); public SvdLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer.java index 520d859f8..5481627ff 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Taser; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TaserLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/tasergun_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/tasergun_e.png"); public TaserLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer2.java b/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer2.java index 1796b27c4..fe08e3c70 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer2.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/TaserLayer2.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Taser; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TaserLayer2 extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/tasergun_e2.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/tasergun_e2.png"); public TaserLayer2(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/TracheliumLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/TracheliumLayer.java index 97fa8dfb1..0fa82eba3 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/TracheliumLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/TracheliumLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.Trachelium; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TracheliumLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/trachelium_texture_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/trachelium_texture_e.png"); public TracheliumLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/layer/VectorLayer.java b/src/main/java/net/mcreator/superbwarfare/client/layer/VectorLayer.java index dbb44a9b5..a0b63d4a1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/layer/VectorLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/layer/VectorLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.gun.VectorItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class VectorLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/vector_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/vector_e.png"); public VectorLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBocekArrow.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBocekArrow.java index 9165ac3d3..60c210fbc 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBocekArrow.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBocekArrow.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelBocekArrow extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modelbocekarrow"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modelbocekarrow"), "main"); public final ModelPart jian; public ModelBocekArrow(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBullet.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBullet.java index d7844df58..27038eb5d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBullet.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelBullet.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelBullet extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modelbullet"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modelbullet"), "main"); public final ModelPart bone; public ModelBullet(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelClaymore.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelClaymore.java index 7de00fe0b..bd14d60b8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelClaymore.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelClaymore.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelClaymore extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modelclaymore"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modelclaymore"), "main"); public final ModelPart claymore; public ModelClaymore(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelGrenade.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelGrenade.java index dc910513a..912b69ba9 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelGrenade.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelGrenade.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelGrenade extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "model_grenade"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "model_grenade"), "main"); public final ModelPart bone; public ModelGrenade(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMissile.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMissile.java index 5202723f7..aadc9b54c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMissile.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMissile.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelMissile extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modelmissile"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modelmissile"), "main"); public final ModelPart bone; public ModelMissile(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMortarShell.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMortarShell.java index 44b8ba516..11b5b7efd 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMortarShell.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelMortarShell.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelMortarShell extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modelmortar_shell_converted"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modelmortar_shell_converted"), "main"); public final ModelPart Rockets; public ModelMortarShell(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelRPGRocket.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelRPGRocket.java index 73d752847..5d1ecbc14 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelRPGRocket.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelRPGRocket.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelRPGRocket extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modelrpg_7_rocket_converted"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modelrpg_7_rocket_converted"), "main"); public final ModelPart Rockets; public ModelRPGRocket(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelTaserRod.java b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelTaserRod.java index 343a65133..72f19af43 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelTaserRod.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/entity/ModelTaserRod.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.model.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; @@ -16,7 +17,7 @@ import net.minecraft.world.entity.Entity; public class ModelTaserRod extends EntityModel { // This layer location should be baked with EntityRendererProvider.Context in // the entity renderer and passed into this model's constructor - public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("target", "modeltaser_rod"), "main"); + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(ModUtils.MODID, "modeltaser_rod"), "main"); public final ModelPart bone; public ModelTaserRod(ModelPart root) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java index 87681f796..e0241313f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.AK47Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -17,17 +18,17 @@ public class AK47ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(AK47Item animatable) { - return new ResourceLocation("target", "animations/ak.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/ak.animation.json"); } @Override public ResourceLocation getModelResource(AK47Item animatable) { - return new ResourceLocation("target", "geo/ak.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/ak.geo.json"); } @Override public ResourceLocation getTextureResource(AK47Item animatable) { - return new ResourceLocation("target", "textures/item/ak47.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/ak47.png"); } @Override @@ -40,7 +41,7 @@ public class AK47ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java index 0d6990a27..70fd273f7 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Aa12Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class Aa12ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Aa12Item animatable) { - return new ResourceLocation("target", "animations/aa12.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/aa12.animation.json"); } @Override public ResourceLocation getModelResource(Aa12Item animatable) { - return new ResourceLocation("target", "geo/aa12.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/aa12.geo.json"); } @Override public ResourceLocation getTextureResource(Aa12Item animatable) { - return new ResourceLocation("target", "textures/item/aa12_new.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/aa12_new.png"); } @Override @@ -36,7 +37,7 @@ public class Aa12ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java index b370877a7..a462f0d9b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Abekiri; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -14,17 +15,17 @@ import software.bernie.geckolib.model.GeoModel; public class AbekiriItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Abekiri animatable) { - return new ResourceLocation("target", "animations/abekiri.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/abekiri.animation.json"); } @Override public ResourceLocation getModelResource(Abekiri animatable) { - return new ResourceLocation("target", "geo/abekiri.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/abekiri.geo.json"); } @Override public ResourceLocation getTextureResource(Abekiri animatable) { - return new ResourceLocation("target", "textures/item/abekiri.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/abekiri.png"); } @Override @@ -36,7 +37,7 @@ public class AbekiriItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java index 46c192c3d..e44a406bd 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.BocekItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class BocekItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(BocekItem animatable) { - return new ResourceLocation("target", "animations/bocek.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/bocek.animation.json"); } @Override public ResourceLocation getModelResource(BocekItem animatable) { - return new ResourceLocation("target", "geo/bocek.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/bocek.geo.json"); } @Override public ResourceLocation getTextureResource(BocekItem animatable) { - return new ResourceLocation("target", "textures/item/bocek.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/bocek.png"); } @Override @@ -49,7 +50,7 @@ public class BocekItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; arrow.setHidden(stack.getOrCreateTag().getInt("arrow_empty") > 0); jian.setHidden(stack.getOrCreateTag().getInt("max_ammo") == 0); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java index 8a41a168a..62e9d91f8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Devotion; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class DevotionItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Devotion animatable) { - return new ResourceLocation("target", "animations/devotion.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/devotion.animation.json"); } @Override public ResourceLocation getModelResource(Devotion animatable) { - return new ResourceLocation("target", "geo/devotion.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/devotion.geo.json"); } @Override public ResourceLocation getTextureResource(Devotion animatable) { - return new ResourceLocation("target", "textures/item/devotion.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/devotion.png"); } @@ -39,7 +40,7 @@ public class DevotionItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java index ce059cbe8..99e30e3ae 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Hk416Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class Hk416ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Hk416Item animatable) { - return new ResourceLocation("target", "animations/hk416.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/hk416.animation.json"); } @Override public ResourceLocation getModelResource(Hk416Item animatable) { - return new ResourceLocation("target", "geo/hk416.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/hk416.geo.json"); } @Override public ResourceLocation getTextureResource(Hk416Item animatable) { - return new ResourceLocation("target", "textures/item/hk416.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/hk416.png"); } @Override @@ -39,7 +40,7 @@ public class Hk416ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (stack.getOrCreateTag().getDouble("flash_time") > 0) { flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java index b9a87bb7b..8e8cd0a1d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.HuntingRifle; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -14,17 +15,17 @@ import software.bernie.geckolib.model.GeoModel; public class HuntingRifleItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(HuntingRifle animatable) { - return new ResourceLocation("target", "animations/hunting_rifle.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/hunting_rifle.animation.json"); } @Override public ResourceLocation getModelResource(HuntingRifle animatable) { - return new ResourceLocation("target", "geo/hunting_rifle.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/hunting_rifle.geo.json"); } @Override public ResourceLocation getTextureResource(HuntingRifle animatable) { - return new ResourceLocation("target", "textures/item/huntingrifle.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/huntingrifle.png"); } @Override @@ -35,7 +36,7 @@ public class HuntingRifleItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/LightSaberItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/LightSaberItemModel.java index 514bc0a55..4b8422df0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/LightSaberItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/LightSaberItemModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.client.model.item; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.LightSaber; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -7,16 +8,16 @@ import software.bernie.geckolib.model.GeoModel; public class LightSaberItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(LightSaber animatable) { - return new ResourceLocation("target", "animations/lightsaber.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/lightsaber.animation.json"); } @Override public ResourceLocation getModelResource(LightSaber animatable) { - return new ResourceLocation("target", "geo/lightsaber.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/lightsaber.geo.json"); } @Override public ResourceLocation getTextureResource(LightSaber animatable) { - return new ResourceLocation("target", "textures/item/lightsaber.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/lightsaber.png"); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index c619197bb..dd6acb6ba 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.M4Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class M4ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M4Item animatable) { - return new ResourceLocation("target", "animations/m4.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/m4.animation.json"); } @Override public ResourceLocation getModelResource(M4Item animatable) { - return new ResourceLocation("target", "geo/m4.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/m4.geo.json"); } @Override public ResourceLocation getTextureResource(M4Item animatable) { - return new ResourceLocation("target", "textures/item/m4.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/m4.png"); } @Override @@ -36,7 +37,7 @@ public class M4ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java index 24836e0ab..c7afc6fd0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.M60Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class M60ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M60Item animatable) { - return new ResourceLocation("target", "animations/m60.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/m60.animation.json"); } @Override public ResourceLocation getModelResource(M60Item animatable) { - return new ResourceLocation("target", "geo/m60.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/m60.geo.json"); } @Override public ResourceLocation getTextureResource(M60Item animatable) { - return new ResourceLocation("target", "textures/item/m60.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/m60.png"); } @Override @@ -44,7 +45,7 @@ public class M60ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (player.getPersistentData().getDouble("prone") > 0) { l.setRotX(1.5f); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java index 94b30949e..a6246e4f3 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.M79Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class M79ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M79Item animatable) { - return new ResourceLocation("target", "animations/m79.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/m79.animation.json"); } @Override public ResourceLocation getModelResource(M79Item animatable) { - return new ResourceLocation("target", "geo/m79.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/m79.geo.json"); } @Override public ResourceLocation getTextureResource(M79Item animatable) { - return new ResourceLocation("target", "textures/item/m79.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/m79.png"); } @Override @@ -36,7 +37,7 @@ public class M79ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java index 5703ebdf5..6a864ee2b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.M870Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class M870ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M870Item animatable) { - return new ResourceLocation("target", "animations/m870.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/m870.animation.json"); } @Override public ResourceLocation getModelResource(M870Item animatable) { - return new ResourceLocation("target", "geo/m870.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/m870.geo.json"); } @Override public ResourceLocation getTextureResource(M870Item animatable) { - return new ResourceLocation("target", "textures/item/m870.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/m870.png"); } @Override @@ -37,7 +38,7 @@ public class M870ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java index 5ff205b17..dbe62daf3 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.M98bItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class M98bItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M98bItem animatable) { - return new ResourceLocation("target", "animations/m98b.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/m98b.animation.json"); } @Override public ResourceLocation getModelResource(M98bItem animatable) { - return new ResourceLocation("target", "geo/m98b.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/m98b.geo.json"); } @Override public ResourceLocation getTextureResource(M98bItem animatable) { - return new ResourceLocation("target", "textures/item/m98b.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/m98b.png"); } @Override @@ -37,7 +38,7 @@ public class M98bItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java index 419689b3d..d2750d1ab 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.MarlinItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -14,17 +15,17 @@ import software.bernie.geckolib.model.GeoModel; public class MarlinItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(MarlinItem animatable) { - return new ResourceLocation("target", "animations/marlin.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/marlin.animation.json"); } @Override public ResourceLocation getModelResource(MarlinItem animatable) { - return new ResourceLocation("target", "geo/marlin.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/marlin.geo.json"); } @Override public ResourceLocation getTextureResource(MarlinItem animatable) { - return new ResourceLocation("target", "textures/item/marlin.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/marlin.png"); } @Override @@ -36,7 +37,7 @@ public class MarlinItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java index 4548d0a8a..555268db8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Minigun; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class MinigunItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Minigun animatable) { - return new ResourceLocation("target", "animations/minigun.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/minigun.animation.json"); } @Override public ResourceLocation getModelResource(Minigun animatable) { - return new ResourceLocation("target", "geo/minigun.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/minigun.geo.json"); } @Override public ResourceLocation getTextureResource(Minigun animatable) { - return new ResourceLocation("target", "textures/item/minigun.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/minigun.png"); } @Override @@ -39,7 +40,7 @@ public class MinigunItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; float fps = Minecraft.getInstance().getFps(); if (fps <= 0) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java index 3d66a6c89..d8eaa0456 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Mk14Item; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class Mk14ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Mk14Item animatable) { - return new ResourceLocation("target", "animations/mk14ebr.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/mk14ebr.animation.json"); } @Override public ResourceLocation getModelResource(Mk14Item animatable) { - return new ResourceLocation("target", "geo/mk14ebr.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/mk14ebr.geo.json"); } @Override public ResourceLocation getTextureResource(Mk14Item animatable) { - return new ResourceLocation("target", "textures/item/mk14.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/mk14.png"); } @Override @@ -44,7 +45,7 @@ public class Mk14ItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (player.getPersistentData().getDouble("prone") > 0) { l.setRotX(-1.5f); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java index 03ab1dee1..0232f7dfb 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Ntw20; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class Ntw20Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Ntw20 animatable) { - return new ResourceLocation("target", "animations/ntw_20.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/ntw_20.animation.json"); } @Override public ResourceLocation getModelResource(Ntw20 animatable) { - return new ResourceLocation("target", "geo/ntw_20.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/ntw_20.geo.json"); } @Override public ResourceLocation getTextureResource(Ntw20 animatable) { - return new ResourceLocation("target", "textures/item/ntw_20.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/ntw_20.png"); } @Override @@ -45,7 +46,7 @@ public class Ntw20Model extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (player.getPersistentData().getDouble("prone") > 0) { l.setRotX(-1.5f); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RocketItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RocketItemModel.java index 2d3edeb04..4f483a40a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RocketItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RocketItemModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.client.model.item; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.common.ammo.Rocket; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -7,16 +8,16 @@ import software.bernie.geckolib.model.GeoModel; public class RocketItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Rocket animatable) { - return new ResourceLocation("target", "animations/rpg.head.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/rpg.head.animation.json"); } @Override public ResourceLocation getModelResource(Rocket animatable) { - return new ResourceLocation("target", "geo/rpg.head.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/rpg.head.geo.json"); } @Override public ResourceLocation getTextureResource(Rocket animatable) { - return new ResourceLocation("target", "textures/item/rpg7.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/rpg7.png"); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java index bb63927ec..d10235d74 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.RpgItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class RpgItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(RpgItem animatable) { - return new ResourceLocation("target", "animations/rpg.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/rpg.animation.json"); } @Override public ResourceLocation getModelResource(RpgItem animatable) { - return new ResourceLocation("target", "geo/rpg.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/rpg.geo.json"); } @Override public ResourceLocation getTextureResource(RpgItem animatable) { - return new ResourceLocation("target", "textures/item/rpg7.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/rpg7.png"); } @Override @@ -38,7 +39,7 @@ public class RpgItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; rocket.setHidden(stack.getOrCreateTag().getBoolean("empty")); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java index ae1b59c4b..95f6f3991 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.RpkItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class RpkItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(RpkItem animatable) { - return new ResourceLocation("target", "animations/rpk.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/rpk.animation.json"); } @Override public ResourceLocation getModelResource(RpkItem animatable) { - return new ResourceLocation("target", "geo/rpk.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/rpk.geo.json"); } @Override public ResourceLocation getTextureResource(RpkItem animatable) { - return new ResourceLocation("target", "textures/item/rpk.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/rpk.png"); } @Override @@ -41,7 +42,7 @@ public class RpkItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java index 95110cfe1..130adbef7 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.SentinelItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -18,17 +19,17 @@ import java.util.concurrent.atomic.AtomicBoolean; public class SentinelItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SentinelItem animatable) { - return new ResourceLocation("target", "animations/sentinel.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/sentinel.animation.json"); } @Override public ResourceLocation getModelResource(SentinelItem animatable) { - return new ResourceLocation("target", "geo/sentinel.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/sentinel.geo.json"); } @Override public ResourceLocation getTextureResource(SentinelItem animatable) { - return new ResourceLocation("target", "textures/item/sentinel.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/sentinel.png"); } @Override @@ -42,7 +43,7 @@ public class SentinelItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java index 82f11da2b..a9f8392e8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.SksItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class SksItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SksItem animatable) { - return new ResourceLocation("target", "animations/sks.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/sks.animation.json"); } @Override public ResourceLocation getModelResource(SksItem animatable) { - return new ResourceLocation("target", "geo/sks.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/sks.geo.json"); } @Override public ResourceLocation getTextureResource(SksItem animatable) { - return new ResourceLocation("target", "textures/item/sks.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/sks.png"); } @@ -39,7 +40,7 @@ public class SksItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (stack.getOrCreateTag().getBoolean("HoldOpen")) { bolt.setPosZ(2.5f); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java index 4e7b8ee53..9094bbafe 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.SvdItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class SvdItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SvdItem animatable) { - return new ResourceLocation("target", "animations/svd.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/svd.animation.json"); } @Override public ResourceLocation getModelResource(SvdItem animatable) { - return new ResourceLocation("target", "geo/svd.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/svd.geo.json"); } @Override public ResourceLocation getTextureResource(SvdItem animatable) { - return new ResourceLocation("target", "textures/item/svd.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/svd.png"); } @Override @@ -43,7 +44,7 @@ public class SvdItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (stack.getOrCreateTag().getBoolean("HoldOpen")) { bolt.setPosZ(3.25f); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java index d305f071d..9b95675fc 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Taser; import net.mcreator.superbwarfare.tools.ItemNBTTool; import net.minecraft.client.Minecraft; @@ -18,17 +19,17 @@ public class TaserItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Taser animatable) { - return new ResourceLocation("target", "animations/taser.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/taser.animation.json"); } @Override public ResourceLocation getModelResource(Taser animatable) { - return new ResourceLocation("target", "geo/taser.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/taser.geo.json"); } @Override public ResourceLocation getTextureResource(Taser animatable) { - return new ResourceLocation("target", "textures/item/tasergun.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/tasergun.png"); } @Override @@ -42,7 +43,7 @@ public class TaserItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; bar.setScaleX((float) ItemNBTTool.getInt(stack, TAG_POWER, 1200) / 1200); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java index 63308c681..cbebd1aa5 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.Trachelium; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -14,17 +15,17 @@ import software.bernie.geckolib.model.GeoModel; public class TracheliumItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Trachelium animatable) { - return new ResourceLocation("target", "animations/trachelium.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/trachelium.animation.json"); } @Override public ResourceLocation getModelResource(Trachelium animatable) { - return new ResourceLocation("target", "geo/trachelium.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/trachelium.geo.json"); } @Override public ResourceLocation getTextureResource(Trachelium animatable) { - return new ResourceLocation("target", "textures/item/trachelium_texture.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/trachelium_texture.png"); } @Override @@ -35,7 +36,7 @@ public class TracheliumItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java index 4328a371f..48023e0ce 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.client.model.item; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.VectorItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -15,17 +16,17 @@ import software.bernie.geckolib.model.GeoModel; public class VectorItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(VectorItem animatable) { - return new ResourceLocation("target", "animations/vector.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/vector.animation.json"); } @Override public ResourceLocation getModelResource(VectorItem animatable) { - return new ResourceLocation("target", "geo/vector.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/vector.geo.json"); } @Override public ResourceLocation getTextureResource(VectorItem animatable) { - return new ResourceLocation("target", "textures/item/vector.png"); + return new ResourceLocation(ModUtils.MODID, "textures/item/vector.png"); } @Override @@ -38,7 +39,7 @@ public class VectorItemModel extends GeoModel { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (stack.getOrCreateTag().getInt("fire_mode") == 0) { kmj.setRotX(-120 * Mth.DEG_TO_RAD); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mk42Renderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mk42Renderer.java index 04e8f87e1..c27502882 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mk42Renderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mk42Renderer.java @@ -17,7 +17,6 @@ public class Mk42Renderer extends GeoEntityRenderer { super(renderManager, new Mk42Model()); this.shadowRadius = 3f; this.addRenderLayer(new Mk42Layer(this)); - } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java index f8351e2e3..e3f984d70 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java @@ -2,9 +2,9 @@ package net.mcreator.superbwarfare.client.screens; import com.mojang.blaze3d.vertex.PoseStack; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModKeyMappings; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModKeyMappings; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.Minecraft; @@ -63,7 +63,7 @@ public class AmmoBarOverlay { event.getGuiGraphics().drawString( Minecraft.getInstance().font, - "[" + TargetModKeyMappings.FIRE_MODE.getKey().getDisplayName().getString() + "]", + "[" + ModKeyMappings.FIRE_MODE.getKey().getDisplayName().getString() + "]", w - 111.5f, h - 20, 0xFFFFFF, @@ -156,11 +156,11 @@ public class AmmoBarOverlay { private static int getGunAmmoCount(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.getItem() == TargetModItems.MINIGUN.get()) { + if (stack.getItem() == ModItems.MINIGUN.get()) { return (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo; } - if (stack.getItem() == TargetModItems.BOCEK.get()) { + if (stack.getItem() == ModItems.BOCEK.get()) { return stack.getOrCreateTag().getInt("max_ammo"); } @@ -170,60 +170,60 @@ public class AmmoBarOverlay { private static String getPlayerAmmoCount(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.getItem() == TargetModItems.MINIGUN.get() || stack.getItem() == TargetModItems.BOCEK.get()) { + if (stack.getItem() == ModItems.MINIGUN.get() || stack.getItem() == ModItems.BOCEK.get()) { return ""; } - if (stack.getItem() == TargetModItems.M_79.get() || stack.getItem() == TargetModItems.RPG.get() || stack.getItem() == TargetModItems.TASER.get()) { + if (stack.getItem() == ModItems.M_79.get() || stack.getItem() == ModItems.RPG.get() || stack.getItem() == ModItems.TASER.get()) { return "" + stack.getOrCreateTag().getInt("max_ammo"); } - if (stack.is(TargetModTags.Items.RIFLE)) { + if (stack.is(ModTags.Items.RIFLE)) { return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo; } - if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { + if (stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) { return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo; } - if (stack.is(TargetModTags.Items.SHOTGUN)) { + if (stack.is(ModTags.Items.SHOTGUN)) { return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo; } - if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + if (stack.is(ModTags.Items.SNIPER_RIFLE)) { return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo; } return ""; } private static String getGunAmmoType(ItemStack stack) { - if (stack.getItem() == TargetModItems.BOCEK.get()) { + if (stack.getItem() == ModItems.BOCEK.get()) { return " Arrow"; } - if (stack.getItem() == TargetModItems.M_79.get()) { + if (stack.getItem() == ModItems.M_79.get()) { return "40mm Grenade"; } - if (stack.getItem() == TargetModItems.RPG.get()) { + if (stack.getItem() == ModItems.RPG.get()) { return "Yassin105 TBG"; } - if (stack.getItem() == TargetModItems.TASER.get()) { + if (stack.getItem() == ModItems.TASER.get()) { return "Electrode Rod"; } - if (stack.getItem() == TargetModItems.MINIGUN.get()) { + if (stack.getItem() == ModItems.MINIGUN.get()) { return "Rifle Ammo"; } - if (stack.is(TargetModTags.Items.RIFLE)) { + if (stack.is(ModTags.Items.RIFLE)) { return " Rifle Ammo"; } - if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { + if (stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) { return "Handgun Ammo"; } - if (stack.is(TargetModTags.Items.SHOTGUN)) { + if (stack.is(ModTags.Items.SHOTGUN)) { return "Shotgun Ammo"; } - if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + if (stack.is(ModTags.Items.SNIPER_RIFLE)) { return "Sniper Ammo"; } return ""; diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/CrossHairOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/CrossHairOverlay.java index d79a4cc6a..c32fd5110 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/CrossHairOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/CrossHairOverlay.java @@ -2,8 +2,8 @@ package net.mcreator.superbwarfare.client.screens; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; @@ -46,7 +46,7 @@ public class CrossHairOverlay { RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); RenderSystem.setShaderColor(1, 1, 1, 1); - if (shouldRenderCrossHair(player) || stack.is(TargetModItems.MINIGUN.get())) { + if (shouldRenderCrossHair(player) || stack.is(ModItems.MINIGUN.get())) { preciseBlit(event.getGuiGraphics(), new ResourceLocation("superbwarfare:textures/screens/point.png"), w / 2f - 7.5f, h / 2f - 8, 0, 0, 16, 16, 16, 16); preciseBlit(event.getGuiGraphics(), new ResourceLocation("superbwarfare:textures/screens/rexheng.png"), w / 2f - 9.5f - 2.8f * (float) spread, h / 2f - 8, 0, 0, 16, 16, 16, 16); preciseBlit(event.getGuiGraphics(), new ResourceLocation("superbwarfare:textures/screens/rexheng.png"), w / 2f - 6.5f + 2.8f * (float) spread, h / 2f - 8, 0, 0, 16, 16, 16, 16); @@ -79,7 +79,7 @@ public class CrossHairOverlay { RenderSystem.disableBlend(); RenderSystem.setShaderColor(1, 1, 1, 1); - if (!stack.is(TargetModTags.Items.GUN)) return; + if (!stack.is(ModTags.Items.GUN)) return; if (stack.getOrCreateTag().getBoolean("need_bolt_action")) { Font font = Minecraft.getInstance().font; @@ -94,10 +94,10 @@ public class CrossHairOverlay { if (player == null) return false; if (player.isSpectator()) return false; - if (!player.getMainHandItem().is(TargetModTags.Items.GUN) || (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) + if (!player.getMainHandItem().is(ModTags.Items.GUN) || (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) return false; - return !(player.getMainHandItem().getItem() == TargetModItems.M_79.get()) + return !(player.getMainHandItem().getItem() == ModItems.M_79.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; } diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/DroneUIOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/DroneUIOverlay.java index 6fbf08fc5..26c881877 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/DroneUIOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/DroneUIOverlay.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.screens; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.mcreator.superbwarfare.entity.DroneEntity; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.resources.ResourceLocation; @@ -36,7 +36,7 @@ public class DroneUIOverlay { RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); RenderSystem.setShaderColor(1, 1, 1, 1); - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { event.getGuiGraphics().blit(new ResourceLocation("superbwarfare:textures/screens/drone.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); DroneEntity entity = player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/KillMessageOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/KillMessageOverlay.java index 7c9e13c48..968c77e9e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/KillMessageOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/KillMessageOverlay.java @@ -4,8 +4,8 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.event.KillMessageHandler; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.tools.PlayerKillRecord; import net.minecraft.client.Minecraft; @@ -89,7 +89,7 @@ public class KillMessageOverlay { AtomicReference targetName = new AtomicReference<>(record.target.getDisplayName().getString()); if (record.target instanceof Player targetPlayer) { CuriosApi.getCuriosInventory(targetPlayer).ifPresent( - c -> c.findFirstCurio(TargetModItems.DOG_TAG.get()).ifPresent( + c -> c.findFirstCurio(ModItems.DOG_TAG.get()).ifPresent( s -> { if (s.stack().hasCustomHoverName()) { targetName.set(s.stack().getHoverName().getString()); @@ -202,7 +202,7 @@ public class KillMessageOverlay { // 渲染击杀者名称 AtomicReference attackerName = new AtomicReference<>(record.attacker.getDisplayName().getString()); CuriosApi.getCuriosInventory(record.attacker).ifPresent( - c -> c.findFirstCurio(TargetModItems.DOG_TAG.get()).ifPresent( + c -> c.findFirstCurio(ModItems.DOG_TAG.get()).ifPresent( s -> { if (s.stack().hasCustomHoverName()) { attackerName.set(s.stack().getHoverName().getString()); @@ -247,24 +247,24 @@ public class KillMessageOverlay { if (record.headshot) { icon = HEADSHOT; } else { - if (record.damageType == TargetModDamageTypes.GUN_FIRE || record.damageType == TargetModDamageTypes.GUN_FIRE_HEADSHOT - || record.damageType == TargetModDamageTypes.ARROW_IN_KNEE || record.damageType == TargetModDamageTypes.ARROW_IN_BRAIN) { + if (record.damageType == ModDamageTypes.GUN_FIRE || record.damageType == ModDamageTypes.GUN_FIRE_HEADSHOT + || record.damageType == ModDamageTypes.ARROW_IN_KNEE || record.damageType == ModDamageTypes.ARROW_IN_BRAIN) { icon = null; } else { // 如果是其他伤害，则渲染对应图标 - if (record.damageType == DamageTypes.EXPLOSION || record.damageType == DamageTypes.PLAYER_EXPLOSION || record.damageType == TargetModDamageTypes.PROJECTILE_BOOM) { + if (record.damageType == DamageTypes.EXPLOSION || record.damageType == DamageTypes.PLAYER_EXPLOSION || record.damageType == ModDamageTypes.PROJECTILE_BOOM) { icon = EXPLOSION; } else if (record.damageType == DamageTypes.PLAYER_ATTACK) { icon = KNIFE; - } else if (record.damageType == TargetModDamageTypes.BEAST) { + } else if (record.damageType == ModDamageTypes.BEAST) { icon = BEAST; - } else if (record.damageType == TargetModDamageTypes.MINE) { + } else if (record.damageType == ModDamageTypes.MINE) { icon = CLAYMORE; } else if (record.damageType == ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("dreamaticvoyage", "bleeding"))) { icon = BLEEDING; } else if (record.damageType == ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("dreamaticvoyage", "blood_crystal"))) { icon = BLOOD_CRYSTAL; - } else if (record.damageType == TargetModDamageTypes.SHOCK) { + } else if (record.damageType == ModDamageTypes.SHOCK) { icon = SHOCK; } else { icon = GENERIC; diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java index 045f750fb..93c98af04 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java @@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.screens; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.mcreator.superbwarfare.entity.Mk42Entity; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; @@ -42,7 +42,7 @@ public class M79UIOverlay { private static boolean shouldRenderCrossHair(Player player) { if (player == null) return false; return !player.isSpectator() - && player.getMainHandItem().getItem() == TargetModItems.M_79.get() + && player.getMainHandItem().getItem() == ModItems.M_79.get() && (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON || (player.isPassenger() && player.getVehicle() instanceof Mk42Entity)) && !player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.zooming).orElse(false); } diff --git a/src/main/java/net/mcreator/superbwarfare/enchantment/LongerWireEnchantment.java b/src/main/java/net/mcreator/superbwarfare/enchantment/LongerWireEnchantment.java index e5b37a276..ba66391d5 100644 --- a/src/main/java/net/mcreator/superbwarfare/enchantment/LongerWireEnchantment.java +++ b/src/main/java/net/mcreator/superbwarfare/enchantment/LongerWireEnchantment.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.enchantment; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.tools.EnchantmentCategoryTool; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; @@ -30,6 +30,6 @@ public class LongerWireEnchantment extends Enchantment { @Override public boolean canApplyAtEnchantingTable(ItemStack itemstack) { - return Ingredient.of(new ItemStack(TargetModItems.TASER.get())).test(itemstack); + return Ingredient.of(new ItemStack(ModItems.TASER.get())).test(itemstack); } } diff --git a/src/main/java/net/mcreator/superbwarfare/enchantment/SuperRechargeEnchantment.java b/src/main/java/net/mcreator/superbwarfare/enchantment/SuperRechargeEnchantment.java index f1c0c272f..b81ad8348 100644 --- a/src/main/java/net/mcreator/superbwarfare/enchantment/SuperRechargeEnchantment.java +++ b/src/main/java/net/mcreator/superbwarfare/enchantment/SuperRechargeEnchantment.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.enchantment; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.tools.EnchantmentCategoryTool; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; @@ -30,6 +30,6 @@ public class SuperRechargeEnchantment extends Enchantment { @Override public boolean canApplyAtEnchantingTable(ItemStack itemstack) { - return Ingredient.of(new ItemStack(TargetModItems.TASER.get())).test(itemstack); + return Ingredient.of(new ItemStack(ModItems.TASER.get())).test(itemstack); } } diff --git a/src/main/java/net/mcreator/superbwarfare/enchantment/VoltOverloadEnchantment.java b/src/main/java/net/mcreator/superbwarfare/enchantment/VoltOverloadEnchantment.java index 9f8c0469a..4ee025a85 100644 --- a/src/main/java/net/mcreator/superbwarfare/enchantment/VoltOverloadEnchantment.java +++ b/src/main/java/net/mcreator/superbwarfare/enchantment/VoltOverloadEnchantment.java @@ -7,7 +7,7 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.ItemStack; import net.minecraft.world.entity.EquipmentSlot; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; public class VoltOverloadEnchantment extends Enchantment { public VoltOverloadEnchantment(EquipmentSlot... slots) { @@ -31,6 +31,6 @@ public class VoltOverloadEnchantment extends Enchantment { @Override public boolean canApplyAtEnchantingTable(ItemStack itemstack) { - return Ingredient.of(new ItemStack(TargetModItems.TASER.get())).test(itemstack); + return Ingredient.of(new ItemStack(ModItems.TASER.get())).test(itemstack); } } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/BocekArrowEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/BocekArrowEntity.java index 97bf0c79d..0a5f39e30 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/BocekArrowEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/BocekArrowEntity.java @@ -3,9 +3,9 @@ package net.mcreator.superbwarfare.entity; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.headshot.BoundingBoxManager; import net.mcreator.superbwarfare.headshot.IHeadshotBox; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; @@ -47,12 +47,12 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier { } public BocekArrowEntity(LivingEntity entity, Level level, int monsterMultiplier) { - super(TargetModEntities.BOCEK_ARROW.get(), entity, level); + super(ModEntities.BOCEK_ARROW.get(), entity, level); this.monsterMultiplier = monsterMultiplier; } public BocekArrowEntity(PlayMessages.SpawnEntity packet, Level world) { - super(TargetModEntities.BOCEK_ARROW.get(), world); + super(ModEntities.BOCEK_ARROW.get(), world); } @Override @@ -89,7 +89,7 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier { Entity entity = result.getEntity(); if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.playSound(TargetModSounds.INDICATION.get()); + living.playSound(ModSounds.INDICATION.get()); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } @@ -130,7 +130,7 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier { if (headshot) { if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.playSound(TargetModSounds.HEADSHOT.get()); + living.playSound(ModSounds.HEADSHOT.get()); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(1, 5)); } @@ -143,15 +143,15 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier { boolean hurt; if (headshot) { if (entity instanceof Monster monster) { - hurt = monster.hurt(TargetModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * 2 * damageMultiplier); + hurt = monster.hurt(ModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * 2 * damageMultiplier); } else { - hurt = entity.hurt(TargetModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * 2); + hurt = entity.hurt(ModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * 2); } } else { if (entity instanceof Monster monster) { - hurt = monster.hurt(TargetModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * damageMultiplier); + hurt = monster.hurt(ModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * damageMultiplier); } else { - hurt = entity.hurt(TargetModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i); + hurt = entity.hurt(ModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i); } } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/CannonShellEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/CannonShellEntity.java index 6482d499e..defeb7e95 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/CannonShellEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/CannonShellEntity.java @@ -59,7 +59,7 @@ public class CannonShellEntity extends ThrowableItemProjectile { } public CannonShellEntity(PlayMessages.SpawnEntity spawnEntity, Level level) { - this(TargetModEntities.CANNON_SHELL.get(), level); + this(ModEntities.CANNON_SHELL.get(), level); } public CannonShellEntity durability(int durability) { @@ -74,18 +74,18 @@ public class CannonShellEntity extends ThrowableItemProjectile { @Override protected Item getDefaultItem() { - return TargetModItems.HE_5_INCHES.get(); + return ModItems.HE_5_INCHES.get(); } @Override public void onHitEntity(EntityHitResult entityHitResult) { Entity entity = entityHitResult.getEntity(); - entity.hurt(TargetModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); + entity.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); entity.invulnerableTime = 0; if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); + living.level().playSound(null, living.blockPosition(), ModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } @@ -139,7 +139,7 @@ public class CannonShellEntity extends ThrowableItemProjectile { Vec3 vec = this.getDeltaMovement(); this.setDeltaMovement(vec.multiply(0.9, 0.9, 0.9)); - if (blockState.is(TargetModBlocks.BARBED_WIRE.get()) || blockState.is(Blocks.NETHERITE_BLOCK)) { + if (blockState.is(ModBlocks.BARBED_WIRE.get()) || blockState.is(Blocks.NETHERITE_BLOCK)) { this.durability -= 10; } @@ -187,7 +187,7 @@ public class CannonShellEntity extends ThrowableItemProjectile { } CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), explosionDamage, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), explosionDamage, this.getX(), this.getY(), this.getZ(), explosionRadius, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1).setFireTime(fireTime); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java index e414faeee..67b7137d1 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java @@ -1,9 +1,9 @@ package net.mcreator.superbwarfare.entity; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.tools.CustomExplosion; import net.mcreator.superbwarfare.tools.ParticleTool; import net.minecraft.core.registries.Registries; @@ -59,7 +59,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated public String animationProcedure = "empty"; public ClaymoreEntity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.CLAYMORE.get(), world); + this(ModEntities.CLAYMORE.get(), world); } public ClaymoreEntity(EntityType type, Level world) { @@ -134,7 +134,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated private void destoryExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 15f, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 15f, this.getX(), this.getY(), this.getZ(), 7.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); @@ -196,7 +196,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated if (this.isOwnedBy(player) && player.isShiftKeyDown()) { if (!this.level().isClientSide()) this.discard(); - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(TargetModItems.CLAYMORE_MINE.get())); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.CLAYMORE_MINE.get())); } return retval; @@ -249,7 +249,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated private void triggerExplode(Entity target) { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeMineDamage(this.level().registryAccess(), this.getOwner()), 40f, + ModDamageTypes.causeMineDamage(this.level().registryAccess(), this.getOwner()), 40f, target.getX(), target.getY(), target.getZ(), 4f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); @@ -277,7 +277,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated @Override public AgeableMob getBreedOffspring(ServerLevel serverWorld, AgeableMob ageable) { - ClaymoreEntity retval = TargetModEntities.CLAYMORE.get().create(serverWorld); + ClaymoreEntity retval = ModEntities.CLAYMORE.get().create(serverWorld); if (retval != null) { retval.finalizeSpawn(serverWorld, serverWorld.getCurrentDifficultyAt(retval.blockPosition()), MobSpawnType.BREEDING, null, null); } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/DroneEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/DroneEntity.java index 5bdf428cb..18a6d7e90 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/DroneEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/DroneEntity.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.entity; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.item.Monitor; import net.mcreator.superbwarfare.tools.SoundTool; import net.minecraft.ChatFormatting; @@ -73,7 +73,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity { public String animationprocedure = "empty"; public DroneEntity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.DRONE.get(), world); + this(ModEntities.DRONE.get(), world); } public DroneEntity(EntityType type, Level world) { @@ -210,11 +210,11 @@ public class DroneEntity extends PathfinderMob implements GeoEntity { || this.getPersistentData().getBoolean("down"); if (!this.onGround()) { - this.level().playSound(null, this.getOnPos(), TargetModSounds.DRONE_SOUND.get(), SoundSource.AMBIENT, 3, 1); + this.level().playSound(null, this.getOnPos(), ModSounds.DRONE_SOUND.get(), SoundSource.AMBIENT, 3, 1); if (control != null) { ItemStack stack = control.getMainHandItem(); if (stack.getOrCreateTag().getBoolean("Using") && control instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.DRONE_SOUND.get(), 100, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.DRONE_SOUND.get(), 100, 1); } } } @@ -254,7 +254,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity { super.mobInteract(player, hand); ItemStack stack = player.getMainHandItem(); - if (stack.getItem() == TargetModItems.MONITOR.get()) { + if (stack.getItem() == ModItems.MONITOR.get()) { if (!player.isCrouching()) { if (!this.entityData.get(LINKED)) { if (stack.getOrCreateTag().getBoolean("Linked")) { @@ -293,12 +293,12 @@ public class DroneEntity extends PathfinderMob implements GeoEntity { } } } else if (stack.isEmpty() && player.isCrouching()) { - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(TargetModItems.DRONE.get())); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.DRONE.get())); for (int index0 = 0; index0 < this.entityData.get(AMMO); index0++) { - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(TargetModItems.GRENADE_40MM.get())); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.GRENADE_40MM.get())); } if (!this.level().isClientSide()) this.discard(); - } else if (stack.getItem() == TargetModItems.GRENADE_40MM.get()) { + } else if (stack.getItem() == ModItems.GRENADE_40MM.get()) { if (!player.isCreative()) { stack.shrink(1); } @@ -306,7 +306,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity { this.entityData.set(AMMO,this.entityData.get(AMMO) + 1); player.displayClientMessage(Component.literal("AMMO:" + this.entityData.get(AMMO)), true); if (player instanceof ServerPlayer serverPlayer) { - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1); } } } @@ -363,7 +363,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity { Player player = this.level().getPlayerByUUID(uuid); if (player != null) { - player.getInventory().items.stream().filter(stack -> stack.getItem() == TargetModItems.MONITOR.get()) + player.getInventory().items.stream().filter(stack -> stack.getItem() == ModItems.MONITOR.get()) .forEach(stack -> { if (stack.getOrCreateTag().getString(Monitor.LINKED_DRONE).equals(this.getStringUUID())) { Monitor.disLink(stack); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/DroneGrenadeEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/DroneGrenadeEntity.java index d92d0d4a3..11911c244 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/DroneGrenadeEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/DroneGrenadeEntity.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.entity; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.tools.CustomExplosion; import net.mcreator.superbwarfare.tools.ParticleTool; import net.minecraft.core.particles.ParticleTypes; @@ -32,11 +32,11 @@ public class DroneGrenadeEntity extends ThrowableItemProjectile { } public DroneGrenadeEntity(LivingEntity entity, Level level) { - super(TargetModEntities.DRONE_GRENADE.get(), entity, level); + super(ModEntities.DRONE_GRENADE.get(), entity, level); } public DroneGrenadeEntity(PlayMessages.SpawnEntity spawnEntity, Level level) { - this(TargetModEntities.DRONE_GRENADE.get(), level); + this(ModEntities.DRONE_GRENADE.get(), level); } @Override @@ -46,7 +46,7 @@ public class DroneGrenadeEntity extends ThrowableItemProjectile { @Override protected Item getDefaultItem() { - return TargetModItems.GRENADE_40MM.get(); + return ModItems.GRENADE_40MM.get(); } @Override @@ -80,7 +80,7 @@ public class DroneGrenadeEntity extends ThrowableItemProjectile { private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 55, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 55, this.getX(), this.getY(), this.getZ(), 6.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/FragEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/FragEntity.java index de8508c8a..2c1e78521 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/FragEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/FragEntity.java @@ -1,10 +1,10 @@ package net.mcreator.superbwarfare.entity; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; @@ -36,11 +36,11 @@ public class FragEntity extends ThrowableItemProjectile { } public FragEntity(LivingEntity entity, Level level) { - super(TargetModEntities.FRAG.get(), entity, level); + super(ModEntities.FRAG.get(), entity, level); } public FragEntity(PlayMessages.SpawnEntity spawnEntity, Level level) { - this(TargetModEntities.FRAG.get(), level); + this(ModEntities.FRAG.get(), level); } public FragEntity setPosition0(Vec3 position0) { @@ -55,7 +55,7 @@ public class FragEntity extends ThrowableItemProjectile { @Override protected Item getDefaultItem() { - return TargetModItems.GRENADE_40MM.get(); + return ModItems.GRENADE_40MM.get(); } @Override @@ -68,10 +68,10 @@ public class FragEntity extends ThrowableItemProjectile { if (this.getOwner() != null && this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); + living.level().playSound(null, living.blockPosition(), ModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); - entity.hurt(TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), + entity.hurt(ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 5 - (float) Mth.clamp(0.1 * this.position0.distanceTo(entity.position()) * (entity instanceof LivingEntity livingEntity ? livingEntity.getMaxHealth() / 100 + 1 : 1), 0, 4.5)); } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/GunGrenadeEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/GunGrenadeEntity.java index d087379fd..dd1110115 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/GunGrenadeEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/GunGrenadeEntity.java @@ -3,10 +3,10 @@ package net.mcreator.superbwarfare.entity; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.headshot.BoundingBoxManager; import net.mcreator.superbwarfare.headshot.IHeadshotBox; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage; import net.mcreator.superbwarfare.tools.CustomExplosion; import net.mcreator.superbwarfare.tools.ParticleTool; @@ -48,13 +48,13 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { } public GunGrenadeEntity(LivingEntity entity, Level level, float damage, int monsterMultiplier) { - super(TargetModEntities.GUN_GRENADE.get(), entity, level); + super(ModEntities.GUN_GRENADE.get(), entity, level); this.damage = damage; this.monsterMultiplier = monsterMultiplier; } public GunGrenadeEntity(PlayMessages.SpawnEntity spawnEntity, Level level) { - this(TargetModEntities.GUN_GRENADE.get(), level); + this(ModEntities.GUN_GRENADE.get(), level); } @Override @@ -64,7 +64,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { @Override protected Item getDefaultItem() { - return TargetModItems.GRENADE_40MM.get(); + return ModItems.GRENADE_40MM.get(); } @Override @@ -73,7 +73,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { Entity entity = result.getEntity(); if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); + living.level().playSound(null, living.blockPosition(), ModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } @@ -106,7 +106,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { if (headshot) { if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.getX(), living.getY(), living.getZ(), TargetModSounds.HEADSHOT.get(), SoundSource.VOICE, 1f, 1f); + living.level().playSound(null, living.getX(), living.getY(), living.getZ(), ModSounds.HEADSHOT.get(), SoundSource.VOICE, 1f, 1f); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(1, 5)); } @@ -118,15 +118,15 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { if (headshot) { if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 2f * damageMultiplier); + monster.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 2f * damageMultiplier); } else { - entity.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 2f); + entity.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 2f); } } else { if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * damageMultiplier); + monster.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * damageMultiplier); } else { - entity.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); + entity.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); } } @@ -170,7 +170,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 1.8f * this.damage, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 1.8f * this.damage, this.getX(), this.getY(), this.getZ(), 7.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(this.monsterMultiplier); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java index 653d428e5..30287ffde 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java @@ -57,7 +57,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { public String animationprocedure = "empty"; public Mk42Entity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.MK_42.get(), world); + this(ModEntities.MK_42.get(), world); } public Mk42Entity(EntityType type, Level world) { @@ -157,10 +157,10 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { return false; } - if (source.is(TargetModDamageTypes.GUN_FIRE) - || source.is(TargetModDamageTypes.GUN_FIRE_HEADSHOT) - || source.is(TargetModDamageTypes.ARROW_IN_BRAIN) - || source.is(TargetModDamageTypes.ARROW_IN_KNEE)) { + if (source.is(ModDamageTypes.GUN_FIRE) + || source.is(ModDamageTypes.GUN_FIRE_HEADSHOT) + || source.is(ModDamageTypes.ARROW_IN_BRAIN) + || source.is(ModDamageTypes.ARROW_IN_KNEE)) { return super.hurt(source, 0.125f * amount); } @@ -195,7 +195,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { private void destroyExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this), 30f, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this), 30f, this.getX(), this.getY(), this.getZ(), 7.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); @@ -281,7 +281,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { int fireTime = 0; int durability = 0; - if (stack.is(TargetModItems.HE_5_INCHES.get())) { + if (stack.is(ModItems.HE_5_INCHES.get())) { hitDamage = 100; explosionRadius = 10; explosionDamage = 200; @@ -289,7 +289,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { fireTime = 5; } - if (stack.is(TargetModItems.AP_5_INCHES.get())) { + if (stack.is(ModItems.AP_5_INCHES.get())) { hitDamage = 450; explosionRadius = 3; explosionDamage = 250; @@ -302,7 +302,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { stack.shrink(1); } - CannonShellEntity entityToSpawn = new CannonShellEntity(TargetModEntities.CANNON_SHELL.get(), + CannonShellEntity entityToSpawn = new CannonShellEntity(ModEntities.CANNON_SHELL.get(), player, level, hitDamage, explosionRadius, explosionDamage, fireProbability, fireTime).durability(durability); entityToSpawn.setPos(this.getX(), this.getEyeY(), this.getZ()); @@ -311,11 +311,11 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { if (player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MK_42_FIRE_1P.get(), 2, 1); - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MK_42_RELOAD.get(), 2, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.MK_42_FIRE_3P.get(), SoundSource.PLAYERS, 6, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.MK_42_FAR.get(), SoundSource.PLAYERS, 16, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.MK_42_VERYFAR.get(), SoundSource.PLAYERS, 32, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.MK_42_FIRE_1P.get(), 2, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.MK_42_RELOAD.get(), 2, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_FIRE_3P.get(), SoundSource.PLAYERS, 6, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_FAR.get(), SoundSource.PLAYERS, 16, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_VERYFAR.get(), SoundSource.PLAYERS, 32, 1); } this.getPersistentData().putInt("fire_cooldown", 30); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java index c30374a69..40477db14 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java @@ -1,10 +1,10 @@ package net.mcreator.superbwarfare.entity; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModAttributes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModAttributes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; @@ -53,7 +53,7 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn public String animationProcedure = "empty"; public MortarEntity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.MORTAR.get(), world); + this(ModEntities.MORTAR.get(), world); } public MortarEntity(EntityType type, Level world) { @@ -170,25 +170,25 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn this.yBodyRotO = this.getYRot(); this.yHeadRotO = this.getYRot(); } - if (mainHandItem.getItem() == TargetModItems.MORTAR_SHELLS.get() && !player.getCooldowns().isOnCooldown(TargetModItems.MORTAR_SHELLS.get()) && !player.isShiftKeyDown()) { + if (mainHandItem.getItem() == ModItems.MORTAR_SHELLS.get() && !player.getCooldowns().isOnCooldown(ModItems.MORTAR_SHELLS.get()) && !player.isShiftKeyDown()) { // this.getPersistentData().putInt("fire_time",25); this.entityData.set(FIRE_TIME,25); - player.getCooldowns().addCooldown(TargetModItems.MORTAR_SHELLS.get(), 30); + player.getCooldowns().addCooldown(ModItems.MORTAR_SHELLS.get(), 30); if (!player.isCreative()) { - player.getInventory().clearOrCountMatchingItems(p -> TargetModItems.MORTAR_SHELLS.get() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); + player.getInventory().clearOrCountMatchingItems(p -> ModItems.MORTAR_SHELLS.get() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); } if (!this.level().isClientSide()) { - this.level().playSound(null, this.getX(), this.getY(), this.getZ(), TargetModSounds.MORTAR_LOAD.get(), SoundSource.PLAYERS, 1f, 1f); - this.level().playSound(null, this.getX(), this.getY(), this.getZ(), TargetModSounds.MORTAR_FIRE.get(), SoundSource.PLAYERS, 8f, 1f); - this.level().playSound(null, this.getX(), this.getY(), this.getZ(), TargetModSounds.MORTAR_DISTANT.get(), SoundSource.PLAYERS, 32f, 1f); + this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_LOAD.get(), SoundSource.PLAYERS, 1f, 1f); + this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_FIRE.get(), SoundSource.PLAYERS, 8f, 1f); + this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_DISTANT.get(), SoundSource.PLAYERS, 32f, 1f); } ModUtils.queueServerWork(20, () -> { Level level = this.level(); if (level instanceof ServerLevel server) { - MortarShellEntity entityToSpawn = new MortarShellEntity(TargetModEntities.MORTAR_SHELL.get(), player, level); + MortarShellEntity entityToSpawn = new MortarShellEntity(ModEntities.MORTAR_SHELL.get(), player, level); entityToSpawn.setPos(this.getX(), this.getEyeY(), this.getZ()); entityToSpawn.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 8, (float) 0.5); level.addFreshEntity(entityToSpawn); @@ -212,7 +212,7 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn Runnable Runnable = () -> { while (Timer[0] < Duration) { - this.setXRot((float) -this.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue()); + this.setXRot((float) -this.getAttribute(ModAttributes.MORTAR_PITCH.get()).getBaseValue()); Timer[0]++; try { @@ -305,7 +305,7 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn var y = this.getY(); var z = this.getZ(); level.explode(null, x, y, z, 0, Level.ExplosionInteraction.NONE); - ItemEntity mortar = new ItemEntity(level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_DEPLOYER.get())); + ItemEntity mortar = new ItemEntity(level, x, (y + 1), z, new ItemStack(ModItems.MORTAR_DEPLOYER.get())); mortar.setPickUpDelay(10); level.addFreshEntity(mortar); } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java index 2c93bd137..168261552 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.entity; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.tools.CustomExplosion; import net.mcreator.superbwarfare.tools.ParticleTool; import net.minecraft.core.particles.ParticleTypes; @@ -42,7 +42,7 @@ public class MortarShellEntity extends ThrowableItemProjectile { } public MortarShellEntity(PlayMessages.SpawnEntity spawnEntity, Level level) { - this(TargetModEntities.MORTAR_SHELL.get(), level); + this(ModEntities.MORTAR_SHELL.get(), level); } @Override @@ -52,7 +52,7 @@ public class MortarShellEntity extends ThrowableItemProjectile { @Override protected Item getDefaultItem() { - return TargetModItems.MORTAR_SHELLS.get(); + return ModItems.MORTAR_SHELLS.get(); } @@ -60,7 +60,7 @@ public class MortarShellEntity extends ThrowableItemProjectile { public void onHitEntity(EntityHitResult entityHitResult) { Entity entity = entityHitResult.getEntity(); - entity.hurt(TargetModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); + entity.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); if (this.level() instanceof ServerLevel) { causeExplode(); @@ -94,7 +94,7 @@ public class MortarShellEntity extends ThrowableItemProjectile { private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 150f, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 150f, this.getX(), this.getY(), this.getZ(), 12.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java index 3b262ddcc..64bd3976c 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java @@ -70,11 +70,11 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa } public ProjectileEntity(Level level) { - super(TargetModEntities.PROJECTILE.get(), level); + super(ModEntities.PROJECTILE.get(), level); } public ProjectileEntity(PlayMessages.SpawnEntity packet, Level world) { - super(TargetModEntities.PROJECTILE.get(), world); + super(ModEntities.PROJECTILE.get(), world); } public ProjectileEntity shooter(LivingEntity shooter) { @@ -321,12 +321,12 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa if (this.beast) { ParticleTool.sendParticle(serverLevel, ParticleTypes.END_ROD, location.x, location.y, location.z, 15, 0.1, 0.1, 0.1, 0.05, true); } else { - ParticleTool.sendParticle(serverLevel, TargetModParticleTypes.BULLET_HOLE.get(), location.x, location.y, location.z, 1, 0, 0, 0, 0, true); + ParticleTool.sendParticle(serverLevel, ModParticleTypes.BULLET_HOLE.get(), location.x, location.y, location.z, 1, 0, 0, 0, 0, true); ParticleTool.sendParticle(serverLevel, ParticleTypes.SMOKE, location.x, location.y, location.z, 3, 0, 0.1, 0, 0.01, true); this.discard(); } - serverLevel.playSound(null, new BlockPos((int) location.x, (int) location.y, (int) location.z), TargetModSounds.LAND.get(), SoundSource.BLOCKS, 1.0F, 1.0F); + serverLevel.playSound(null, new BlockPos((int) location.x, (int) location.y, (int) location.z), ModSounds.LAND.get(), SoundSource.BLOCKS, 1.0F, 1.0F); } } @@ -344,11 +344,11 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa if (this.shooter instanceof ServerPlayer player) { ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); - var holder = Holder.direct(TargetModSounds.INDICATION.get()); + var holder = Holder.direct(ModSounds.INDICATION.get()); player.connection.send(new ClientboundSoundPacket(holder, SoundSource.PLAYERS, player.getX(), player.getY(), player.getZ(), 1f, 1f, player.level().random.nextLong())); ((ServerLevel) this.level()).sendParticles(ParticleTypes.DAMAGE_INDICATOR, living.getX(), living.getY() + .5, living.getZ(), 1000, .4, .7, .4, 0); - ModUtils.PACKET_HANDLER.send(PacketDistributor.ALL.noArg(), new PlayerGunKillMessage(player.getId(), living.getId(), false, TargetModDamageTypes.BEAST)); + ModUtils.PACKET_HANDLER.send(PacketDistributor.ALL.noArg(), new PlayerGunKillMessage(player.getId(), living.getId(), false, ModDamageTypes.BEAST)); } if (living instanceof ServerPlayer victim) { @@ -373,28 +373,28 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa if (headshot) { if (!this.shooter.level().isClientSide() && this.shooter instanceof ServerPlayer player) { - var holder = Holder.direct(TargetModSounds.HEADSHOT.get()); + var holder = Holder.direct(ModSounds.HEADSHOT.get()); player.connection.send(new ClientboundSoundPacket(holder, SoundSource.PLAYERS, player.getX(), player.getY(), player.getZ(), 1f, 1f, player.level().random.nextLong())); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(1, 5)); } if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.headShot * m_multiple); + monster.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.headShot * m_multiple); } else { - entity.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.headShot); + entity.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.headShot); } } else if (legshot) { if (!this.shooter.level().isClientSide() && this.shooter instanceof ServerPlayer player) { - var holder = Holder.direct(TargetModSounds.INDICATION.get()); + var holder = Holder.direct(ModSounds.INDICATION.get()); player.connection.send(new ClientboundSoundPacket(holder, SoundSource.PLAYERS, player.getX(), player.getY(), player.getZ(), 1f, 1f, player.level().random.nextLong())); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.legShot * m_multiple); + monster.hurt(ModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.legShot * m_multiple); } else { - entity.hurt(TargetModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.legShot); + entity.hurt(ModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage * this.legShot); } if (entity instanceof LivingEntity living) { @@ -408,16 +408,16 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa } else { if (!this.shooter.level().isClientSide() && this.shooter instanceof ServerPlayer player) { - var holder = Holder.direct(TargetModSounds.INDICATION.get()); + var holder = Holder.direct(ModSounds.INDICATION.get()); player.connection.send(new ClientboundSoundPacket(holder, SoundSource.PLAYERS, player.getX(), player.getY(), player.getZ(), 1f, 1f, player.level().random.nextLong())); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage * m_multiple); + monster.hurt(ModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage * m_multiple); } else { - entity.hurt(TargetModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage); + entity.hurt(ModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), this.damage); } } this.discard(); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/RpgRocketEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/RpgRocketEntity.java index f8503f0a7..34dc45889 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/RpgRocketEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/RpgRocketEntity.java @@ -3,10 +3,10 @@ package net.mcreator.superbwarfare.entity; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.headshot.BoundingBoxManager; import net.mcreator.superbwarfare.headshot.IHeadshotBox; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage; import net.mcreator.superbwarfare.tools.CustomExplosion; import net.mcreator.superbwarfare.tools.ParticleTool; @@ -48,13 +48,13 @@ public class RpgRocketEntity extends ThrowableItemProjectile { } public RpgRocketEntity(LivingEntity entity, Level level, float damage, int monsterMultiplier) { - super(TargetModEntities.RPG_ROCKET.get(), entity, level); + super(ModEntities.RPG_ROCKET.get(), entity, level); this.damage = damage; this.monsterMultiplier = monsterMultiplier; } public RpgRocketEntity(PlayMessages.SpawnEntity spawnEntity, Level level) { - this(TargetModEntities.RPG_ROCKET.get(), level); + this(ModEntities.RPG_ROCKET.get(), level); } @Override @@ -64,7 +64,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { @Override protected Item getDefaultItem() { - return TargetModItems.ROCKET.get(); + return ModItems.ROCKET.get(); } @Override @@ -73,7 +73,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { Entity entity = result.getEntity(); if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); + living.level().playSound(null, living.blockPosition(), ModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } @@ -106,7 +106,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { if (headshot) { if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.playSound(TargetModSounds.HEADSHOT.get(), 1, 1); + living.playSound(ModSounds.HEADSHOT.get(), 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(1, 5)); } @@ -118,15 +118,15 @@ public class RpgRocketEntity extends ThrowableItemProjectile { if (headshot) { if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 5f * damageMultiplier); + monster.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 5f * damageMultiplier); } else { - entity.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 5f); + entity.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * 5f); } } else { if (entity instanceof Monster monster) { - monster.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * damageMultiplier); + monster.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * damageMultiplier); } else { - entity.hurt(TargetModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); + entity.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); } } @@ -185,7 +185,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), (float) 2 / 3 * this.damage, + ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), (float) 2 / 3 * this.damage, this.getX(), this.getY(), this.getZ(), 10f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(this.monsterMultiplier); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java index c89f1b4b6..54a3f1c20 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.entity; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModSounds; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; @@ -52,7 +52,7 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity { public String animationProcedure = "empty"; public SenpaiEntity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.SENPAI.get(), world); + this(ModEntities.SENPAI.get(), world); } public SenpaiEntity(EntityType type, Level world) { @@ -117,7 +117,7 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity { @Override public void playStepSound(BlockPos pos, BlockState blockIn) { - this.playSound(TargetModSounds.STEP.get(), 0.25f, 1); + this.playSound(ModSounds.STEP.get(), 0.25f, 1); } @Override @@ -158,9 +158,9 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity { } public static void init() { - SpawnPlacements.register(TargetModEntities.SENPAI.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, + SpawnPlacements.register(ModEntities.SENPAI.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, (entityType, world, reason, pos, random) -> (world.getDifficulty() != Difficulty.PEACEFUL && Monster.isDarkEnoughToSpawn(world, pos, random) && Mob.checkMobSpawnRules(entityType, world, reason, pos, random))); - DungeonHooks.addDungeonMob(TargetModEntities.SENPAI.get(), 180); + DungeonHooks.addDungeonMob(ModEntities.SENPAI.get(), 180); } public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java index 3cbb94069..0a391f5a3 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.entity; -import net.mcreator.superbwarfare.init.TargetModEntities; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModEntities; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.tools.SoundTool; import net.minecraft.commands.arguments.EntityAnchorArgument; @@ -59,7 +59,7 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE public String animationProcedure = "empty"; public Target1Entity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.TARGET_1.get(), world); + this(ModEntities.TARGET_1.get(), world); } public Target1Entity(EntityType type, Level world) { @@ -122,9 +122,9 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE } if (!this.level().isClientSide()) { - this.level().playSound(null, BlockPos.containing(this.getX(), this.getY(), this.getZ()), TargetModSounds.HIT.get(), SoundSource.BLOCKS, 8, 1); + this.level().playSound(null, BlockPos.containing(this.getX(), this.getY(), this.getZ()), ModSounds.HIT.get(), SoundSource.BLOCKS, 8, 1); } else { - this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), TargetModSounds.HIT.get(), SoundSource.BLOCKS, 8, 1, false); + this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), ModSounds.HIT.get(), SoundSource.BLOCKS, 8, 1, false); } return super.hurt(source, amount); } @@ -169,7 +169,7 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE if (sourceEntity instanceof Player player) { player.displayClientMessage(Component.literal(("Target Down " + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceEntity.position()))) + "M")), true); - SoundTool.playLocalSound(player, TargetModSounds.TARGET_DOWN.get(), 100, 1); + SoundTool.playLocalSound(player, ModSounds.TARGET_DOWN.get(), 100, 1); entity.getPersistentData().putDouble("target_down", 100); } } @@ -185,7 +185,7 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE this.discard(); } - player.addItem(new ItemStack(TargetModItems.TARGET_DEPLOYER.get())); + player.addItem(new ItemStack(ModItems.TARGET_DEPLOYER.get())); } else { if (!(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { this.lookAt(EntityAnchorArgument.Anchor.EYES, new Vec3((player.getX()), this.getY(), (player.getZ()))); @@ -300,7 +300,7 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE protected void tickDeath() { ++this.deathTime; if (this.deathTime >= 100) { - this.spawnAtLocation(new ItemStack(TargetModItems.TARGET_DEPLOYER.get())); + this.spawnAtLocation(new ItemStack(ModItems.TARGET_DEPLOYER.get())); this.remove(Target1Entity.RemovalReason.KILLED); } } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java index 0b721e308..5653c9d38 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.entity; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; @@ -41,7 +41,7 @@ public class TargetEntity extends PathfinderMob implements GeoEntity, AnimatedEn public String animationProcedure = "empty"; public TargetEntity(PlayMessages.SpawnEntity packet, Level world) { - this(TargetModEntities.TARGET.get(), world); + this(ModEntities.TARGET.get(), world); } public TargetEntity(EntityType type, Level world) { diff --git a/src/main/java/net/mcreator/superbwarfare/entity/TaserBulletProjectileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/TaserBulletProjectileEntity.java index e7d0b8e8e..6e692ff8f 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/TaserBulletProjectileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/TaserBulletProjectileEntity.java @@ -5,7 +5,7 @@ import net.mcreator.superbwarfare.ModUtils; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraftforge.network.PlayMessages; import net.minecraftforge.network.NetworkHooks; import net.minecraftforge.api.distmarker.OnlyIn; @@ -37,11 +37,11 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu public static final ItemStack PROJECTILE_ITEM = new ItemStack(Blocks.AIR); public TaserBulletProjectileEntity(PlayMessages.SpawnEntity packet, Level world) { - super(TargetModEntities.TASER_BULLET_PROJECTILE.get(), world); + super(ModEntities.TASER_BULLET_PROJECTILE.get(), world); } public TaserBulletProjectileEntity(LivingEntity entity, Level level, float damage, int volt, int wire_length) { - super(TargetModEntities.TASER_BULLET_PROJECTILE.get(), entity, level); + super(ModEntities.TASER_BULLET_PROJECTILE.get(), entity, level); this.damage = damage; this.volt = volt; this.wire_length = wire_length; @@ -78,19 +78,19 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu Entity entity = result.getEntity(); if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); + living.level().playSound(null, living.blockPosition(), ModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } } if (entity instanceof LivingEntity living) { entity.invulnerableTime = 0; - entity.hurt(TargetModDamageTypes.causeShockDamage(this.level().registryAccess(), this.getOwner()), this.damage); + entity.hurt(ModDamageTypes.causeShockDamage(this.level().registryAccess(), this.getOwner()), this.damage); if (living instanceof Player player && player.isCreative()) { return; } if (!living.level().isClientSide()) { - living.addEffect(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, volt), this.getOwner()); + living.addEffect(new MobEffectInstance(ModMobEffects.SHOCK.get(), 100, volt), this.getOwner()); } } this.discard(); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/layer/Mk42Layer.java b/src/main/java/net/mcreator/superbwarfare/entity/layer/Mk42Layer.java index a9e99f61b..ac9e9428c 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/layer/Mk42Layer.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/layer/Mk42Layer.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.layer; +import net.mcreator.superbwarfare.ModUtils; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -15,7 +16,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.PoseStack; public class Mk42Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/entity/sherman_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/entity/sherman_e.png"); public Mk42Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/layer/MortarLayer.java b/src/main/java/net/mcreator/superbwarfare/entity/layer/MortarLayer.java index 451257487..d3129b39f 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/layer/MortarLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/layer/MortarLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.entity.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.MortarEntity; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MortarLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/entity/mortar_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/entity/mortar_e.png"); public MortarLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/layer/TargetLayer.java b/src/main/java/net/mcreator/superbwarfare/entity/layer/TargetLayer.java index 829b584d8..715306b71 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/layer/TargetLayer.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/layer/TargetLayer.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.entity.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.TargetEntity; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -12,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TargetLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/entities/target_e.png"); + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/entities/target_e.png"); public TargetLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/ClaymoreModel.java b/src/main/java/net/mcreator/superbwarfare/entity/model/ClaymoreModel.java index 1cd15cbfb..6eb85464c 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/ClaymoreModel.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/ClaymoreModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.ClaymoreEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -7,17 +8,17 @@ import software.bernie.geckolib.model.GeoModel; public class ClaymoreModel extends GeoModel { @Override public ResourceLocation getAnimationResource(ClaymoreEntity entity) { - return new ResourceLocation("target", "animations/claymore.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/claymore.animation.json"); } @Override public ResourceLocation getModelResource(ClaymoreEntity entity) { - return new ResourceLocation("target", "geo/claymore.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/claymore.geo.json"); } @Override public ResourceLocation getTextureResource(ClaymoreEntity entity) { - return new ResourceLocation("target", "textures/entity/claymore.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/claymore.png"); } } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/DroneModel.java b/src/main/java/net/mcreator/superbwarfare/entity/model/DroneModel.java index c3a48a6e4..f1b7f7370 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/DroneModel.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/DroneModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; @@ -13,17 +14,17 @@ import static net.mcreator.superbwarfare.entity.DroneEntity.AMMO; public class DroneModel extends GeoModel { @Override public ResourceLocation getAnimationResource(DroneEntity entity) { - return new ResourceLocation("target", "animations/drone.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/drone.animation.json"); } @Override public ResourceLocation getModelResource(DroneEntity entity) { - return new ResourceLocation("target", "geo/drone.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/drone.geo.json"); } @Override public ResourceLocation getTextureResource(DroneEntity entity) { - return new ResourceLocation("target", "textures/entity/drone.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/drone.png"); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/Mk42Model.java b/src/main/java/net/mcreator/superbwarfare/entity/model/Mk42Model.java index 243f087b5..e4fb22c15 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/Mk42Model.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/Mk42Model.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.Mk42Entity; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -13,17 +14,17 @@ import software.bernie.geckolib.model.data.EntityModelData; public class Mk42Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Mk42Entity entity) { - return new ResourceLocation("target", "animations/mk_42.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/mk_42.animation.json"); } @Override public ResourceLocation getModelResource(Mk42Entity entity) { - return new ResourceLocation("target", "geo/sherman.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/sherman.geo.json"); } @Override public ResourceLocation getTextureResource(Mk42Entity entity) { - return new ResourceLocation("target", "textures/entity/sherman.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/sherman.png"); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/MortarModel.java b/src/main/java/net/mcreator/superbwarfare/entity/model/MortarModel.java index 937b1cc0b..d1daa29d6 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/MortarModel.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/MortarModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.MortarEntity; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -12,17 +13,17 @@ import software.bernie.geckolib.model.data.EntityModelData; public class MortarModel extends GeoModel { @Override public ResourceLocation getAnimationResource(MortarEntity entity) { - return new ResourceLocation("target", "animations/mortar.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/mortar.animation.json"); } @Override public ResourceLocation getModelResource(MortarEntity entity) { - return new ResourceLocation("target", "geo/mortar.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/mortar.geo.json"); } @Override public ResourceLocation getTextureResource(MortarEntity entity) { - return new ResourceLocation("target", "textures/entity/mortar.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/mortar.png"); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/SenpaiModel.java b/src/main/java/net/mcreator/superbwarfare/entity/model/SenpaiModel.java index ce0edabc3..115a9a328 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/SenpaiModel.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/SenpaiModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.SenpaiEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -7,17 +8,17 @@ import software.bernie.geckolib.model.GeoModel; public class SenpaiModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SenpaiEntity entity) { - return new ResourceLocation("target", "animations/senpai.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/senpai.animation.json"); } @Override public ResourceLocation getModelResource(SenpaiEntity entity) { - return new ResourceLocation("target", "geo/senpai.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/senpai.geo.json"); } @Override public ResourceLocation getTextureResource(SenpaiEntity entity) { - return new ResourceLocation("target", "textures/entity/senpai.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/senpai.png"); } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/Target1Model.java b/src/main/java/net/mcreator/superbwarfare/entity/model/Target1Model.java index 89cfe406e..99995bb94 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/Target1Model.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/Target1Model.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.Target1Entity; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -12,17 +13,17 @@ import software.bernie.geckolib.model.data.EntityModelData; public class Target1Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Target1Entity entity) { - return new ResourceLocation("target", "animations/superbwarfare.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/target.animation.json"); } @Override public ResourceLocation getModelResource(Target1Entity entity) { - return new ResourceLocation("target", "geo/superbwarfare.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/target.geo.json"); } @Override public ResourceLocation getTextureResource(Target1Entity entity) { - return new ResourceLocation("target", "textures/entity/superbwarfare.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/target.png"); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/TargetModel.java b/src/main/java/net/mcreator/superbwarfare/entity/model/TargetModel.java index 419527490..4164855c4 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/TargetModel.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/TargetModel.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity.model; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.TargetEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -7,17 +8,17 @@ import software.bernie.geckolib.model.GeoModel; public class TargetModel extends GeoModel { @Override public ResourceLocation getAnimationResource(TargetEntity entity) { - return new ResourceLocation("target", "animations/target2.animation.json"); + return new ResourceLocation(ModUtils.MODID, "animations/target2.animation.json"); } @Override public ResourceLocation getModelResource(TargetEntity entity) { - return new ResourceLocation("target", "geo/target2.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/target2.geo.json"); } @Override public ResourceLocation getTextureResource(TargetEntity entity) { - return new ResourceLocation("target", "textures/entity/superbwarfare.png"); + return new ResourceLocation(ModUtils.MODID, "textures/entity/superbwarfare.png"); } } diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index 767ddc53f..5a2387144 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -2,9 +2,9 @@ package net.mcreator.superbwarfare.event; import net.mcreator.superbwarfare.entity.DroneEntity; import net.mcreator.superbwarfare.entity.Mk42Entity; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModMobEffects; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModMobEffects; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.network.message.ZoomMessage; import net.minecraft.client.CameraType; @@ -57,7 +57,7 @@ public class ClientEventHandler { if (level != null && entity instanceof LivingEntity living && entity.isPassenger() && entity.getVehicle() instanceof Mk42Entity) { handleCannonCamera(event, living); } - if (level != null && entity instanceof LivingEntity living && living.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (level != null && entity instanceof LivingEntity living && living.getMainHandItem().is(ModTags.Items.GUN)) { handleWeaponCrossHair(living); handleWeaponSway(living); handleWeaponMove(living); @@ -90,12 +90,12 @@ public class ClientEventHandler { ItemStack stack = player.getMainHandItem(); if (event.getHand() == hand) { - if (player.getUseItem().is(TargetModTags.Items.GUN)) { + if (player.getUseItem().is(ModTags.Items.GUN)) { event.setCanceled(true); } } - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { DroneEntity drone = player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) .stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst().orElse(null); @@ -107,7 +107,7 @@ public class ClientEventHandler { } private static void handleWeaponCrossHair(LivingEntity entity) { - if (entity.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (entity.getMainHandItem().is(ModTags.Items.GUN)) { float fps = Minecraft.getInstance().getFps(); if (fps <= 30) { fps = 30f; @@ -125,7 +125,7 @@ public class ClientEventHandler { } private static void handleWeaponSway(LivingEntity entity) { - if (entity.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (entity.getMainHandItem().is(ModTags.Items.GUN)) { float fps = Minecraft.getInstance().getFps(); if (fps <= 30) { fps = 30f; @@ -153,7 +153,7 @@ public class ClientEventHandler { } private static void handleWeaponMove(LivingEntity entity) { - if (entity.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (entity.getMainHandItem().is(ModTags.Items.GUN)) { float fps = Minecraft.getInstance().getFps(); if (fps <= 30) { fps = 30f; @@ -361,7 +361,7 @@ public class ClientEventHandler { } private static void handleShockCamera(ViewportEvent.ComputeCameraAngles event, LivingEntity entity) { - if (entity.hasEffect(TargetModMobEffects.SHOCK.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) { + if (entity.hasEffect(ModMobEffects.SHOCK.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) { event.setYaw(Minecraft.getInstance().gameRenderer.getMainCamera().getYRot() + (float) Mth.nextDouble(RandomSource.create(), -3, 3)); event.setPitch(Minecraft.getInstance().gameRenderer.getMainCamera().getXRot() + (float) Mth.nextDouble(RandomSource.create(), -3, 3)); event.setRoll((float) Mth.nextDouble(RandomSource.create(), 8, 12)); @@ -373,7 +373,7 @@ public class ClientEventHandler { double yaw = event.getYaw(); double pitch = event.getPitch(); double roll = event.getRoll(); - if (entity.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (entity.getMainHandItem().is(ModTags.Items.GUN)) { event.setPitch((float) (pitch + data.getDouble("camera_rot_x") + 0.2 * data.getDouble("xRot") + 3 * data.getDouble("vy"))); @@ -419,7 +419,7 @@ public class ClientEventHandler { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.GUN)) { + if (stack.is(ModTags.Items.GUN)) { if (!event.usedConfiguredFov()) { return; } @@ -453,12 +453,12 @@ public class ClientEventHandler { return; } - if (mc.player.getMainHandItem().is(TargetModTags.Items.GUN) || (mc.player.getVehicle() != null && mc.player.getVehicle() instanceof Mk42Entity)) { + if (mc.player.getMainHandItem().is(ModTags.Items.GUN) || (mc.player.getVehicle() != null && mc.player.getVehicle() instanceof Mk42Entity)) { event.setCanceled(true); } ItemStack stack = mc.player.getMainHandItem(); - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { event.setCanceled(true); } } diff --git a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java index 536b79897..1a4e43893 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java @@ -40,7 +40,7 @@ public class GunEventHandler { ItemStack stack = player.getMainHandItem(); - if (event.phase == TickEvent.Phase.END && stack.is(TargetModTags.Items.GUN)) { + if (event.phase == TickEvent.Phase.END && stack.is(ModTags.Items.GUN)) { handleGunFire(player); handleMiniGunFire(player); handleGunReload(player); @@ -54,12 +54,12 @@ public class GunEventHandler { */ private static void handleGunFire(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.NORMAL_GUN)) { + if (stack.is(ModTags.Items.NORMAL_GUN)) { double mode = stack.getOrCreateTag().getInt("fire_mode"); int interval = stack.getOrCreateTag().getInt("fire_interval"); - if (!player.getPersistentData().getBoolean("firing") && player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) { + if (!player.getPersistentData().getBoolean("firing") && player.getMainHandItem().getItem() == ModItems.DEVOTION.get()) { stack.getOrCreateTag().putDouble("fire_increase", 0); } @@ -113,11 +113,11 @@ public class GunEventHandler { stack.getOrCreateTag().putDouble("empty", 1); - if (stack.getItem() == TargetModItems.M_60.get()) { + if (stack.getItem() == ModItems.M_60.get()) { stack.getOrCreateTag().putBoolean("bullet_chain", true); } - if (stack.getItem() == TargetModItems.M_4.get() || player.getMainHandItem().getItem() == TargetModItems.HK_416.get()) { + if (stack.getItem() == ModItems.M_4.get() || player.getMainHandItem().getItem() == ModItems.HK_416.get()) { if (stack.getOrCreateTag().getDouble("fire_sequence") == 1) { stack.getOrCreateTag().putDouble("fire_sequence", 0); } else { @@ -125,11 +125,11 @@ public class GunEventHandler { } } - if (stack.getItem() == TargetModItems.DEVOTION.get()) { + if (stack.getItem() == ModItems.DEVOTION.get()) { stack.getOrCreateTag().putDouble("fire_increase", stack.getOrCreateTag().getDouble("fire_increase") + 0.334); } - if (stack.getItem() == TargetModItems.ABEKIRI.get()) { + if (stack.getItem() == ModItems.ABEKIRI.get()) { stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(InteractionHand.MAIN_HAND)); if (player instanceof ServerPlayer serverPlayer && player.level() instanceof ServerLevel serverLevel) { ParticleTool.sendParticle(serverLevel, ParticleTypes.CLOUD, player.getX() + 1.8 * player.getLookAngle().x, player.getY() + player.getBbHeight() - 0.1 + 1.8 * player.getLookAngle().y, @@ -137,7 +137,7 @@ public class GunEventHandler { } } - if (stack.getItem() == TargetModItems.SENTINEL.get()) { + if (stack.getItem() == ModItems.SENTINEL.get()) { stack.getCapability(ForgeCapabilities.ENERGY).ifPresent( iEnergyStorage -> iEnergyStorage.extractEnergy(3000, false) ); @@ -145,7 +145,7 @@ public class GunEventHandler { } int zoom_add_cooldown = 0; - if (stack.getItem() == TargetModItems.MARLIN.get()) { + if (stack.getItem() == ModItems.MARLIN.get()) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { zoom_add_cooldown = 5; stack.getOrCreateTag().putDouble("marlin_animation_time", 15); @@ -189,7 +189,7 @@ public class GunEventHandler { */ private static void handleMiniGunFire(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.getItem() != TargetModItems.MINIGUN.get()) { + if (stack.getItem() != ModItems.MINIGUN.get()) { return; } @@ -200,7 +200,7 @@ public class GunEventHandler { tag.putDouble("minigun_rotation", (tag.getDouble("minigun_rotation") + 1)); } if (!player.level().isClientSide() && player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MINIGUN_ROT.get(), 2f, 1f); + SoundTool.playLocalSound(serverPlayer, ModSounds.MINIGUN_ROT.get(), 2f, 1f); } } else if (tag.getDouble("minigun_rotation") > 0) { tag.putDouble("minigun_rotation", (tag.getDouble("minigun_rotation") - 0.5)); @@ -214,23 +214,23 @@ public class GunEventHandler { tag.putDouble("overheat", 40); player.getCooldowns().addCooldown(stack.getItem(), 40); if (!player.level().isClientSide() && player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MINIGUN_OVERHEAT.get(), 2f, 1f); + SoundTool.playLocalSound(serverPlayer, ModSounds.MINIGUN_OVERHEAT.get(), 2f, 1f); } } if (!player.level().isClientSide() && player instanceof ServerPlayer serverPlayer) { if (tag.getDouble("heat") <= 40) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MINIGUN_FIRE_1P.get(), 2f, 1f); - player.playSound(TargetModSounds.MINIGUN_FIRE_3P.get(), 4f, 1f); - player.playSound(TargetModSounds.MINIGUN_FAR.get(), 12f, 1f); - player.playSound(TargetModSounds.MINIGUN_VERYFAR.get(), 24f, 1f); + SoundTool.playLocalSound(serverPlayer, ModSounds.MINIGUN_FIRE_1P.get(), 2f, 1f); + player.playSound(ModSounds.MINIGUN_FIRE_3P.get(), 4f, 1f); + player.playSound(ModSounds.MINIGUN_FAR.get(), 12f, 1f); + player.playSound(ModSounds.MINIGUN_VERYFAR.get(), 24f, 1f); } else { float pitch = (float) (1 - 0.025 * Math.abs(40 - tag.getDouble("heat"))); - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MINIGUN_FIRE_1P.get(), 2f, pitch); - player.playSound(TargetModSounds.MINIGUN_FIRE_3P.get(), 4f, pitch); - player.playSound(TargetModSounds.MINIGUN_FAR.get(), 12f, pitch); - player.playSound(TargetModSounds.MINIGUN_VERYFAR.get(), 24f, pitch); + SoundTool.playLocalSound(serverPlayer, ModSounds.MINIGUN_FIRE_1P.get(), 2f, pitch); + player.playSound(ModSounds.MINIGUN_FIRE_3P.get(), 4f, pitch); + player.playSound(ModSounds.MINIGUN_FAR.get(), 12f, pitch); + player.playSound(ModSounds.MINIGUN_VERYFAR.get(), 24f, pitch); } } @@ -254,7 +254,7 @@ public class GunEventHandler { */ public static void playGunSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -262,7 +262,7 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - if (stack.getItem() == TargetModItems.SENTINEL.get()) { + if (stack.getItem() == ModItems.SENTINEL.get()) { AtomicBoolean charged = new AtomicBoolean(false); stack.getCapability(ForgeCapabilities.ENERGY).ifPresent( @@ -318,7 +318,7 @@ public class GunEventHandler { public static void playGunBoltSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -338,7 +338,7 @@ public class GunEventHandler { if (!player.level().isClientSide()) { float headshot = (float) heldItem.getOrCreateTag().getDouble("headshot"); - int monster_multiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), heldItem); + int monster_multiple = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.MONSTER_HUNTER.get(), heldItem); float damage = (float) (heldItem.getOrCreateTag().getDouble("damage") + heldItem.getOrCreateTag().getDouble("add_damage")) * (float) heldItem.getOrCreateTag().getDouble("damageadd"); ProjectileEntity projectile = new ProjectileEntity(player.level()) @@ -367,7 +367,7 @@ public class GunEventHandler { CompoundTag tag = stack.getOrCreateTag(); //启动换弹 if (tag.getBoolean("start_reload")) { - if (stack.is(TargetModTags.Items.OPEN_BOLT)) { + if (stack.is(ModTags.Items.OPEN_BOLT)) { if (tag.getInt("ammo") == 0) { tag.putInt("gun_reloading_time", (int) tag.getDouble("empty_reload_time")); stack.getOrCreateTag().putBoolean("is_empty_reloading", true); @@ -389,7 +389,7 @@ public class GunEventHandler { tag.putInt("gun_reloading_time", tag.getInt("gun_reloading_time") - 1); } - if (stack.getItem() == TargetModItems.RPG.get()) { + if (stack.getItem() == ModItems.RPG.get()) { if (tag.getInt("gun_reloading_time") == 84) { tag.putBoolean("empty", false); } @@ -398,26 +398,26 @@ public class GunEventHandler { } } - if (stack.getItem() == TargetModItems.MK_14.get()) { + if (stack.getItem() == ModItems.MK_14.get()) { if (tag.getInt("gun_reloading_time") == 18) { tag.putBoolean("HoldOpen", false); } } - if (stack.getItem() == TargetModItems.SKS.get()) { + if (stack.getItem() == ModItems.SKS.get()) { if (tag.getInt("gun_reloading_time") == 14) { tag.putBoolean("HoldOpen", false); } } - if (stack.getItem() == TargetModItems.M_60.get()) { + if (stack.getItem() == ModItems.M_60.get()) { if (tag.getInt("gun_reloading_time") == 55) { tag.putBoolean("bullet_chain", false); } } if (tag.getInt("gun_reloading_time") == 1) { - if (stack.is(TargetModTags.Items.OPEN_BOLT)) { + if (stack.is(ModTags.Items.OPEN_BOLT)) { if (tag.getInt("ammo") == 0) { playGunEmptyReload(player); } else { @@ -432,18 +432,18 @@ public class GunEventHandler { public static void playGunNormalReload(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.SHOTGUN)) { - if (stack.getItem() == TargetModItems.ABEKIRI.get()) { + if (stack.is(ModTags.Items.SHOTGUN)) { + if (stack.getItem() == ModItems.ABEKIRI.get()) { GunsTool.reload(player, GunInfo.Type.SHOTGUN); } else { GunsTool.reload(player, GunInfo.Type.SHOTGUN, true); } - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE)) { GunsTool.reload(player, GunInfo.Type.SNIPER, true); - } else if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { + } else if (stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) { GunsTool.reload(player, GunInfo.Type.HANDGUN, true); - } else if (stack.is(TargetModTags.Items.RIFLE)) { - if (stack.getItem() == TargetModItems.M_60.get()) { + } else if (stack.is(ModTags.Items.RIFLE)) { + if (stack.getItem() == ModItems.M_60.get()) { GunsTool.reload(player, GunInfo.Type.RIFLE); } else { GunsTool.reload(player, GunInfo.Type.RIFLE, true); @@ -456,23 +456,23 @@ public class GunEventHandler { public static void playGunEmptyReload(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.SHOTGUN)) { + if (stack.is(ModTags.Items.SHOTGUN)) { GunsTool.reload(player, GunInfo.Type.SHOTGUN); - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE)) { GunsTool.reload(player, GunInfo.Type.SNIPER); - } else if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { + } else if (stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) { GunsTool.reload(player, GunInfo.Type.HANDGUN); - } else if (stack.is(TargetModTags.Items.RIFLE)) { + } else if (stack.is(ModTags.Items.RIFLE)) { GunsTool.reload(player, GunInfo.Type.RIFLE); - } else if (stack.getItem() == TargetModItems.TASER.get()) { + } else if (stack.getItem() == ModItems.TASER.get()) { stack.getOrCreateTag().putInt("ammo", 1); - player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.TASER_ELECTRODE.get(), 1, player.inventoryMenu.getCraftSlots()); - } else if (stack.getItem() == TargetModItems.M_79.get()) { + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == ModItems.TASER_ELECTRODE.get(), 1, player.inventoryMenu.getCraftSlots()); + } else if (stack.getItem() == ModItems.M_79.get()) { stack.getOrCreateTag().putInt("ammo", 1); - player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.GRENADE_40MM.get(), 1, player.inventoryMenu.getCraftSlots()); - } else if (stack.getItem() == TargetModItems.RPG.get()) { + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == ModItems.GRENADE_40MM.get(), 1, player.inventoryMenu.getCraftSlots()); + } else if (stack.getItem() == ModItems.RPG.get()) { stack.getOrCreateTag().putInt("ammo", 1); - player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.ROCKET.get(), 1, player.inventoryMenu.getCraftSlots()); + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == ModItems.ROCKET.get(), 1, player.inventoryMenu.getCraftSlots()); } stack.getOrCreateTag().putBoolean("is_normal_reloading", false); @@ -481,7 +481,7 @@ public class GunEventHandler { public static void playGunEmptyReloadSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -498,7 +498,7 @@ public class GunEventHandler { public static void playGunNormalReloadSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -559,7 +559,7 @@ public class GunEventHandler { } - if (stack.getItem() == TargetModItems.M_870.get()) { + if (stack.getItem() == ModItems.M_870.get()) { if (tag.getInt("prepare_load") == 10) { singleLoad(player); } @@ -572,13 +572,13 @@ public class GunEventHandler { //检查备弹 var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()); - if (stack.is(TargetModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) { + if (stack.is(ModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) { tag.putBoolean("force_stage3_start", true); - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) { tag.putBoolean("force_stage3_start", true); - } else if ((stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) && capability.handgunAmmo == 0) { + } else if ((stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) && capability.handgunAmmo == 0) { tag.putBoolean("force_stage3_start", true); - } else if (stack.is(TargetModTags.Items.RIFLE) && capability.rifleAmmo == 0) { + } else if (stack.is(ModTags.Items.RIFLE) && capability.rifleAmmo == 0) { tag.putBoolean("force_stage3_start", true); } else { tag.putInt("reload_stage", 2); @@ -611,13 +611,13 @@ public class GunEventHandler { //装填 - if (stack.getItem() == TargetModItems.M_870.get()) { + if (stack.getItem() == ModItems.M_870.get()) { if (tag.getInt("iterative") == 3) { singleLoad(player); } } - if (stack.getItem() == TargetModItems.MARLIN.get()) { + if (stack.getItem() == ModItems.MARLIN.get()) { if (tag.getInt("iterative") == 3) { singleLoad(player); } @@ -633,13 +633,13 @@ public class GunEventHandler { //备弹耗尽结束 var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()); - if (stack.is(TargetModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) { + if (stack.is(ModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) { tag.putInt("reload_stage", 3); - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) { tag.putInt("reload_stage", 3); - } else if ((stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) && capability.handgunAmmo == 0) { + } else if ((stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) && capability.handgunAmmo == 0) { tag.putInt("reload_stage", 3); - } else if (stack.is(TargetModTags.Items.RIFLE) && capability.rifleAmmo == 0) { + } else if (stack.is(ModTags.Items.RIFLE) && capability.rifleAmmo == 0) { tag.putInt("reload_stage", 3); } @@ -674,22 +674,22 @@ public class GunEventHandler { tag.putInt("ammo", tag.getInt("ammo") + 1); - if (stack.is(TargetModTags.Items.SHOTGUN)) { + if (stack.is(ModTags.Items.SHOTGUN)) { player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.shotgunAmmo = capability.shotgunAmmo - 1; capability.syncPlayerVariables(player); }); - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE)) { player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.sniperAmmo = capability.sniperAmmo - 1; capability.syncPlayerVariables(player); }); - } else if ((stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG))) { + } else if ((stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG))) { player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.handgunAmmo = capability.handgunAmmo - 1; capability.syncPlayerVariables(player); }); - } else if (stack.is(TargetModTags.Items.RIFLE)) { + } else if (stack.is(ModTags.Items.RIFLE)) { player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.rifleAmmo = capability.rifleAmmo - 1; capability.syncPlayerVariables(player); @@ -699,7 +699,7 @@ public class GunEventHandler { public static void playGunPrepareReloadSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -716,7 +716,7 @@ public class GunEventHandler { public static void playGunPrepareLoadReloadSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -733,7 +733,7 @@ public class GunEventHandler { public static void playGunLoopReloadSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -750,7 +750,7 @@ public class GunEventHandler { public static void playGunEndReloadSounds(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } @@ -793,7 +793,7 @@ public class GunEventHandler { iEnergyStorage -> iEnergyStorage.receiveEnergy(24000, false) ); - player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.SHIELD_CELL.get(), 1, player.inventoryMenu.getCraftSlots()); + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == ModItems.SHIELD_CELL.get(), 1, player.inventoryMenu.getCraftSlots()); } if (tag.getInt("sentinel_charge_time") == 1) { diff --git a/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java index 4af1d70db..5cc012453 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java @@ -2,10 +2,10 @@ package net.mcreator.superbwarfare.event; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.Target1Entity; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage; @@ -61,29 +61,29 @@ public class LivingEventHandler { double damage = amount; ItemStack stack = sourceentity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY; - if ((damagesource.is(TargetModDamageTypes.ARROW_IN_KNEE) || damagesource.is(TargetModDamageTypes.ARROW_IN_BRAIN) - && stack.getItem() == TargetModItems.BOCEK.get())) { + if ((damagesource.is(ModDamageTypes.ARROW_IN_KNEE) || damagesource.is(ModDamageTypes.ARROW_IN_BRAIN) + && stack.getItem() == ModItems.BOCEK.get())) { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } - if ((damagesource.is(TargetModDamageTypes.PROJECTILE_BOOM) || damagesource.is(DamageTypes.ARROW)) - && (stack.getItem() == TargetModItems.M_79.get() || stack.getItem() == TargetModItems.RPG.get()) + if ((damagesource.is(ModDamageTypes.PROJECTILE_BOOM) || damagesource.is(DamageTypes.ARROW)) + && (stack.getItem() == ModItems.M_79.get() || stack.getItem() == ModItems.RPG.get()) ) { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } - if (damagesource.is(TargetModDamageTypes.GUN_FIRE) || damagesource.is(TargetModDamageTypes.GUN_FIRE_HEADSHOT)) { + if (damagesource.is(ModDamageTypes.GUN_FIRE) || damagesource.is(ModDamageTypes.GUN_FIRE_HEADSHOT)) { double distance = entity.position().distanceTo(sourceentity.position()); - if (stack.is(TargetModTags.Items.SHOTGUN) || stack.getItem() == TargetModItems.BOCEK.get()) { + if (stack.is(ModTags.Items.SHOTGUN) || stack.getItem() == ModItems.BOCEK.get()) { damage = reduceDamageByDistance(amount, distance, 0.03, 25); - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE)) { damage = reduceDamageByDistance(amount, distance, 0.001, 200); - } else if (stack.is(TargetModTags.Items.HANDGUN)) { + } else if (stack.is(ModTags.Items.HANDGUN)) { damage = reduceDamageByDistance(amount, distance, 0.03, 50); - } else if (stack.is(TargetModTags.Items.SMG)) { + } else if (stack.is(ModTags.Items.SMG)) { damage = reduceDamageByDistance(amount, distance, 0.03, 50); - } else if (stack.is(TargetModTags.Items.RIFLE)) { + } else if (stack.is(ModTags.Items.RIFLE)) { damage = reduceDamageByDistance(amount, distance, 0.0025, 150); } event.setAmount((float) damage); @@ -105,7 +105,7 @@ public class LivingEventHandler { } if (!sourceEntity.level().isClientSide() && sourceEntity instanceof ServerPlayer player) { - SoundTool.playLocalSound(player, TargetModSounds.TARGET_DOWN.get(), 100f, 1f); + SoundTool.playLocalSound(player, ModSounds.TARGET_DOWN.get(), 100f, 1f); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(2, 8)); } @@ -124,8 +124,8 @@ public class LivingEventHandler { } if (sourceEntity instanceof ServerPlayer player && (damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) - || damagesource.is(TargetModDamageTypes.MINE) || damagesource.is(TargetModDamageTypes.PROJECTILE_BOOM))) { - SoundTool.playLocalSound(player, TargetModSounds.INDICATION.get(), 1f, 1f); + || damagesource.is(ModDamageTypes.MINE) || damagesource.is(ModDamageTypes.PROJECTILE_BOOM))) { + SoundTool.playLocalSound(player, ModSounds.INDICATION.get(), 1f, 1f); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } @@ -241,7 +241,7 @@ public class LivingEventHandler { } if (attacker != null) { - if (source.is(TargetModDamageTypes.GUN_FIRE_HEADSHOT) || source.is(TargetModDamageTypes.ARROW_IN_BRAIN)) { + if (source.is(ModDamageTypes.GUN_FIRE_HEADSHOT) || source.is(ModDamageTypes.ARROW_IN_BRAIN)) { ModUtils.PACKET_HANDLER.send(PacketDistributor.ALL.noArg(), new PlayerGunKillMessage(attacker.getId(), entity.getId(), true, damageTypeResourceKey)); } else { ModUtils.PACKET_HANDLER.send(PacketDistributor.ALL.noArg(), new PlayerGunKillMessage(attacker.getId(), entity.getId(), false, damageTypeResourceKey)); diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java index 653eb37f8..25de35058 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java @@ -1,9 +1,9 @@ package net.mcreator.superbwarfare.event; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.network.message.SimulationDistanceMessage; import net.mcreator.superbwarfare.tools.SoundTool; @@ -43,7 +43,7 @@ public class PlayerEventHandler { } for (ItemStack stack : player.getInventory().items) { - if (stack.is(TargetModTags.Items.GUN)) { + if (stack.is(ModTags.Items.GUN)) { stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag")); } } @@ -66,7 +66,7 @@ public class PlayerEventHandler { ItemStack stack = player.getMainHandItem(); if (event.phase == TickEvent.Phase.END) { - if (stack.is(TargetModTags.Items.GUN)) { + if (stack.is(ModTags.Items.GUN)) { handlePlayerProne(player); handlePlayerSprint(player); handleWeaponLevel(player); @@ -150,7 +150,7 @@ public class PlayerEventHandler { */ private static void handleWeaponLevel(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.GUN)) { + if (stack.is(ModTags.Items.GUN)) { var tag = stack.getOrCreateTag(); if (tag.getInt("level") == 0) { tag.putDouble("exp2", 20); @@ -169,19 +169,19 @@ public class PlayerEventHandler { public static void handleAmmoCount(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.RIFLE)) { + if (stack.is(ModTags.Items.RIFLE)) { stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo)); } - if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { + if (stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) { stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo)); } - if (stack.is(TargetModTags.Items.SHOTGUN)) { + if (stack.is(ModTags.Items.SHOTGUN)) { stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo)); } - if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + if (stack.is(ModTags.Items.SNIPER_RIFLE)) { stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo)); } @@ -199,12 +199,12 @@ public class PlayerEventHandler { private static void handlePrepareZoom(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.GUN) + if (stack.is(ModTags.Items.GUN) && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && !player.isSpectator() && !stack.getOrCreateTag().getBoolean("charging") && !stack.getOrCreateTag().getBoolean("reloading")) { - if (player.getMainHandItem().getItem() != TargetModItems.MINIGUN.get()) { + if (player.getMainHandItem().getItem() != ModItems.MINIGUN.get()) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) { player.setSprinting(false); player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { @@ -219,17 +219,17 @@ public class PlayerEventHandler { private static void handleSpecialWeaponAmmo(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.getItem() == TargetModItems.RPG.get() && stack.getOrCreateTag().getInt("ammo") == 1) { + if (stack.getItem() == ModItems.RPG.get() && stack.getOrCreateTag().getInt("ammo") == 1) { stack.getOrCreateTag().putDouble("empty", 0); } - if (stack.getItem() == TargetModItems.BOCEK.get() && stack.getOrCreateTag().getInt("ammo") == 1) { + if (stack.getItem() == ModItems.BOCEK.get() && stack.getOrCreateTag().getInt("ammo") == 1) { stack.getOrCreateTag().putDouble("empty", 0); } } private static void handleChangeFireRate(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.GUN)) { + if (stack.is(ModTags.Items.GUN)) { if (stack.getOrCreateTag().getDouble("cg") > 0) { stack.getOrCreateTag().putDouble("cg", (stack.getOrCreateTag().getDouble("cg") - 1)); } @@ -262,7 +262,7 @@ public class PlayerEventHandler { CompoundTag tag = mainHandItem.getOrCreateTag(); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).bowPullHold) { - if (mainHandItem.getItem() == TargetModItems.BOCEK.get() + if (mainHandItem.getItem() == ModItems.BOCEK.get() && tag.getInt("max_ammo") > 0 && !player.getCooldowns().isOnCooldown(mainHandItem.getItem()) && tag.getDouble("power") < 12 @@ -276,12 +276,12 @@ public class PlayerEventHandler { } if (tag.getDouble("power") == 1) { if (!player.level().isClientSide() && player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.BOCEK_PULL_1P.get(), 2f, 1f); - player.level().playSound(null, player.blockPosition(), TargetModSounds.BOCEK_PULL_3P.get(), SoundSource.PLAYERS, 0.5f, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.BOCEK_PULL_1P.get(), 2f, 1f); + player.level().playSound(null, player.blockPosition(), ModSounds.BOCEK_PULL_3P.get(), SoundSource.PLAYERS, 0.5f, 1); } } } else { - if (mainHandItem.getItem() == TargetModItems.BOCEK.get()) { + if (mainHandItem.getItem() == ModItems.BOCEK.get()) { tag.putDouble("power", 0); } player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { @@ -292,7 +292,7 @@ public class PlayerEventHandler { } private static void handleGunRecoil(Player player) { - if (!player.getMainHandItem().is(TargetModTags.Items.GUN)) return; + if (!player.getMainHandItem().is(ModTags.Items.GUN)) return; CompoundTag tag = player.getMainHandItem().getOrCreateTag(); float recoilX = (float) tag.getDouble("recoil_x"); diff --git a/src/main/java/net/mcreator/superbwarfare/headshot/BoundingBoxManager.java b/src/main/java/net/mcreator/superbwarfare/headshot/BoundingBoxManager.java index 63c16fefd..b6c27bb8e 100644 --- a/src/main/java/net/mcreator/superbwarfare/headshot/BoundingBoxManager.java +++ b/src/main/java/net/mcreator/superbwarfare/headshot/BoundingBoxManager.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.headshot; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -40,8 +40,8 @@ public class BoundingBoxManager { } return new AABB(headBox.minX * scale, headBox.minY * scale, headBox.minZ * scale, headBox.maxX * scale, headBox.maxY * scale, headBox.maxZ * scale); }); - registerHeadshotBox(TargetModEntities.SENPAI.get(), new BasicHeadshotBox<>(8.0, 22.0)); - registerHeadshotBox(TargetModEntities.TARGET_1.get(), new BasicHeadshotBox<>(14.0, 20.0)); + registerHeadshotBox(ModEntities.SENPAI.get(), new BasicHeadshotBox<>(8.0, 22.0)); + registerHeadshotBox(ModEntities.TARGET_1.get(), new BasicHeadshotBox<>(14.0, 20.0)); registerHeadshotBox(EntityType.ENDERMAN, new BasicHeadshotBox<>(8.0, 38.0)); registerHeadshotBox(EntityType.ZOMBIE, new ChildHeadshotBox<>(8.0, 26.0, 0.75, 0.5)); registerHeadshotBox(EntityType.ZOMBIFIED_PIGLIN, new ChildHeadshotBox<>(8.0, 26.0, 0.75, 0.5)); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModAttributes.java b/src/main/java/net/mcreator/superbwarfare/init/ModAttributes.java similarity index 92% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModAttributes.java rename to src/main/java/net/mcreator/superbwarfare/init/ModAttributes.java index 0c497e2d4..1da1925de 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModAttributes.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModAttributes.java @@ -13,7 +13,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class TargetModAttributes { +public class ModAttributes { public static final DeferredRegister ATTRIBUTES = DeferredRegister.create(ForgeRegistries.ATTRIBUTES, ModUtils.MODID); public static final RegistryObject MORTAR_PITCH = ATTRIBUTES.register("mortar_pitch", () -> (new RangedAttribute("attribute." + ModUtils.MODID + ".mortar_pitch", 70, 20, 89)).setSyncable(true)); @@ -25,6 +25,6 @@ public class TargetModAttributes { @SubscribeEvent public static void addAttributes(EntityAttributeModificationEvent event) { - event.add(TargetModEntities.MORTAR.get(), MORTAR_PITCH.get()); + event.add(ModEntities.MORTAR.get(), MORTAR_PITCH.get()); } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModBlocks.java b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java similarity index 97% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModBlocks.java rename to src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java index 814bed1ab..0c0af31f0 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModBlocks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java @@ -7,7 +7,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class TargetModBlocks { +public class ModBlocks { public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.BLOCKS, ModUtils.MODID); public static final RegistryObject SANDBAG = REGISTRY.register("sandbag", SandbagBlock::new); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModDamageTypes.java b/src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java similarity index 99% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModDamageTypes.java rename to src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java index 8a3fce61f..e8948cad6 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModDamageTypes.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java @@ -15,7 +15,7 @@ import net.minecraft.world.entity.LivingEntity; import javax.annotation.Nullable; @SuppressWarnings("OptionalGetWithoutIsPresent") -public class TargetModDamageTypes { +public class ModDamageTypes { public static final ResourceKey GUN_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire")); public static final ResourceKey GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot")); public static final ResourceKey ARROW_IN_KNEE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_knee")); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModEnchantments.java b/src/main/java/net/mcreator/superbwarfare/init/ModEnchantments.java similarity index 97% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModEnchantments.java rename to src/main/java/net/mcreator/superbwarfare/init/ModEnchantments.java index d19c112d0..a8adcc677 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModEnchantments.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModEnchantments.java @@ -13,7 +13,7 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.mcreator.superbwarfare.enchantment.VoltOverloadEnchantment; import net.mcreator.superbwarfare.enchantment.SuperRechargeEnchantment; -public class TargetModEnchantments { +public class ModEnchantments { public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, ModUtils.MODID); public static final RegistryObject VOLT_OVERLOAD = REGISTRY.register("volt_overload", () -> new VoltOverloadEnchantment()); public static final RegistryObject SUPER_RECHARGE = REGISTRY.register("super_recharge", () -> new SuperRechargeEnchantment()); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModEntities.java b/src/main/java/net/mcreator/superbwarfare/init/ModEntities.java similarity index 99% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModEntities.java rename to src/main/java/net/mcreator/superbwarfare/init/ModEntities.java index 2956d4220..57a66a453 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModEntities.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModEntities.java @@ -14,7 +14,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class TargetModEntities { +public class ModEntities { public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, ModUtils.MODID); public static final RegistryObject> TARGET_1 = register("target_1", diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModEntityRenderers.java b/src/main/java/net/mcreator/superbwarfare/init/ModEntityRenderers.java new file mode 100644 index 000000000..e364c7a71 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/init/ModEntityRenderers.java @@ -0,0 +1,30 @@ +package net.mcreator.superbwarfare.init; + +import net.mcreator.superbwarfare.client.renderer.entity.*; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.EntityRenderersEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +public class ModEntityRenderers { + @SubscribeEvent + public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { + event.registerEntityRenderer(ModEntities.TARGET_1.get(), Target1Renderer::new); + event.registerEntityRenderer(ModEntities.MORTAR.get(), MortarRenderer::new); + event.registerEntityRenderer(ModEntities.SENPAI.get(), SenpaiRenderer::new); + event.registerEntityRenderer(ModEntities.CLAYMORE.get(), ClaymoreRenderer::new); + event.registerEntityRenderer(ModEntities.TASER_BULLET_PROJECTILE.get(), TaserBulletProjectileRenderer::new); + event.registerEntityRenderer(ModEntities.GUN_GRENADE.get(), GunGrenadeRenderer::new); + event.registerEntityRenderer(ModEntities.TARGET.get(), TargetRenderer::new); + event.registerEntityRenderer(ModEntities.RPG_ROCKET.get(), RpgRocketRenderer::new); + event.registerEntityRenderer(ModEntities.MORTAR_SHELL.get(), MortarShellRenderer::new); + event.registerEntityRenderer(ModEntities.CANNON_SHELL.get(), CannonShellRenderer::new); + event.registerEntityRenderer(ModEntities.BOCEK_ARROW.get(), BocekArrowRenderer::new); + event.registerEntityRenderer(ModEntities.PROJECTILE.get(), ProjectileRenderer::new); + event.registerEntityRenderer(ModEntities.FRAG.get(), FragRenderer::new); + event.registerEntityRenderer(ModEntities.MK_42.get(), Mk42Renderer::new); + event.registerEntityRenderer(ModEntities.DRONE.get(), DroneRenderer::new); + event.registerEntityRenderer(ModEntities.DRONE_GRENADE.get(), DroneGrenadeRenderer::new); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java similarity index 95% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModItems.java rename to src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 8f4d84b2b..fa7b4c4b0 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -18,7 +18,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @SuppressWarnings("unused") -public class TargetModItems { +public class ModItems { /** * guns @@ -76,16 +76,16 @@ public class TargetModItems { */ public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ModUtils.MODID); - public static final RegistryObject SENPAI_SPAWN_EGG = ITEMS.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(TargetModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); - public static final RegistryObject MK_42_SPAWN_EGG = ITEMS.register("mk42_spawn_egg", () -> new ForgeSpawnEggItem(TargetModEntities.MK_42, -8348258, -2630437, new Item.Properties())); + public static final RegistryObject SENPAI_SPAWN_EGG = ITEMS.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); + public static final RegistryObject MK_42_SPAWN_EGG = ITEMS.register("mk42_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MK_42, -8348258, -2630437, new Item.Properties())); public static final RegistryObject DRONE = ITEMS.register("drone", Drone::new); public static final RegistryObject MONITOR = ITEMS.register("monitor", Monitor::new); public static final RegistryObject TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetDeployer::new); - public static final RegistryObject SANDBAG = block(TargetModBlocks.SANDBAG); - public static final RegistryObject BARBED_WIRE = block(TargetModBlocks.BARBED_WIRE); + public static final RegistryObject SANDBAG = block(ModBlocks.SANDBAG); + public static final RegistryObject BARBED_WIRE = block(ModBlocks.BARBED_WIRE); public static final RegistryObject CLAYMORE_MINE = ITEMS.register("claymore_mine", ClaymoreMine::new); - public static final RegistryObject JUMP_PAD = block(TargetModBlocks.JUMP_PAD); + public static final RegistryObject JUMP_PAD = block(ModBlocks.JUMP_PAD); public static final RegistryObject LIGHT_SABER = ITEMS.register("light_saber", LightSaber::new); public static final RegistryObject HAMMER = ITEMS.register("hammer", Hammer::new); public static final RegistryObject MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); @@ -106,10 +106,10 @@ public class TargetModItems { public static final RegistryObject COAL_POWDER = ITEMS.register("coal_powder", CoalPowder::new); public static final RegistryObject COAL_IRON_POWDER = ITEMS.register("coal_iron_powder", CoalIronPowder::new); public static final RegistryObject RAW_CEMENTED_CARBIDE_POWDER = ITEMS.register("raw_cemented_carbide_powder", RawCementedCarbidePowder::new); - public static final RegistryObject GALENA_ORE = block(TargetModBlocks.GALENA_ORE); - public static final RegistryObject DEEPSLATE_GALENA_ORE = block(TargetModBlocks.DEEPSLATE_GALENA_ORE); - public static final RegistryObject SCHEELITE_ORE = block(TargetModBlocks.SCHEELITE_ORE); - public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(TargetModBlocks.DEEPSLATE_SCHEELITE_ORE); + public static final RegistryObject GALENA_ORE = block(ModBlocks.GALENA_ORE); + public static final RegistryObject DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE); + public static final RegistryObject SCHEELITE_ORE = block(ModBlocks.SCHEELITE_ORE); + public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(ModBlocks.DEEPSLATE_SCHEELITE_ORE); public static final RegistryObject GALENA = ITEMS.register("galena", Galena::new); public static final RegistryObject SCHEELITE = ITEMS.register("scheelite", Scheelite::new); public static final RegistryObject DOG_TAG = ITEMS.register("dog_tag", DogTag::new); @@ -162,7 +162,7 @@ public class TargetModItems { public static final RegistryObject DEVOTION_BLUEPRINT = ITEMS.register("devotion_blueprint", DevotionBlueprint::new); public static final RegistryObject TASER_BLUEPRINT = ITEMS.register("taser_blueprint", TaserBlueprint::new); - public static final RegistryObject GUN_RECYCLE = block(TargetModBlocks.GUN_RECYCLE); + public static final RegistryObject GUN_RECYCLE = block(ModBlocks.GUN_RECYCLE); private static RegistryObject block(RegistryObject block) { diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModKeyMappings.java b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java similarity index 89% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModKeyMappings.java rename to src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java index 8ae12d6b5..bd146b649 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModKeyMappings.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java @@ -12,8 +12,8 @@ import net.minecraftforge.fml.common.Mod; import org.lwjgl.glfw.GLFW; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT}) -public class TargetModKeyMappings { - public static final KeyMapping RELOAD = new KeyMapping("key.superbwarfare.reload", GLFW.GLFW_KEY_R, "key.categories.target") { +public class ModKeyMappings { + public static final KeyMapping RELOAD = new KeyMapping("key.superbwarfare.reload", GLFW.GLFW_KEY_R, "key.categories.superbwarfare") { private boolean isDownOld = false; @Override @@ -26,7 +26,7 @@ public class TargetModKeyMappings { } }; - public static final KeyMapping DOUBLE_JUMP = new KeyMapping("key.superbwarfare.double_jump", GLFW.GLFW_KEY_SPACE, "key.categories.target") { + public static final KeyMapping DOUBLE_JUMP = new KeyMapping("key.superbwarfare.double_jump", GLFW.GLFW_KEY_SPACE, "key.categories.superbwarfare") { private boolean isDownOld = false; @Override @@ -42,7 +42,7 @@ public class TargetModKeyMappings { } }; - public static final KeyMapping FIRE_MODE = new KeyMapping("key.superbwarfare.fire_mode", GLFW.GLFW_KEY_N, "key.categories.target") { + public static final KeyMapping FIRE_MODE = new KeyMapping("key.superbwarfare.fire_mode", GLFW.GLFW_KEY_N, "key.categories.superbwarfare") { private boolean isDownOld = false; @Override @@ -56,7 +56,7 @@ public class TargetModKeyMappings { } }; - public static final KeyMapping SENSITIVITY_INCREASE = new KeyMapping("key.superbwarfare.sensitivity_increase", GLFW.GLFW_KEY_PAGE_UP, "key.categories.target") { + public static final KeyMapping SENSITIVITY_INCREASE = new KeyMapping("key.superbwarfare.sensitivity_increase", GLFW.GLFW_KEY_PAGE_UP, "key.categories.superbwarfare") { private boolean isDownOld = false; @Override @@ -69,7 +69,7 @@ public class TargetModKeyMappings { } }; - public static final KeyMapping SENSITIVITY_REDUCE = new KeyMapping("key.superbwarfare.sensitivity_reduce", GLFW.GLFW_KEY_PAGE_DOWN, "key.categories.target") { + public static final KeyMapping SENSITIVITY_REDUCE = new KeyMapping("key.superbwarfare.sensitivity_reduce", GLFW.GLFW_KEY_PAGE_DOWN, "key.categories.superbwarfare") { private boolean isDownOld = false; @Override @@ -82,7 +82,7 @@ public class TargetModKeyMappings { } }; - public static final KeyMapping INTERACT = new KeyMapping("key.superbwarfare.interact", GLFW.GLFW_KEY_X, "key.categories.target") { + public static final KeyMapping INTERACT = new KeyMapping("key.superbwarfare.interact", GLFW.GLFW_KEY_X, "key.categories.superbwarfare") { private boolean isDownOld = false; @Override @@ -90,7 +90,9 @@ public class TargetModKeyMappings { super.setDown(isDown); if (isDownOld != isDown && isDown) { ModUtils.PACKET_HANDLER.sendToServer(new InteractMessage(0)); - InteractMessage.pressAction(Minecraft.getInstance().player, 0); + if (Minecraft.getInstance().player != null) { + InteractMessage.pressAction(Minecraft.getInstance().player, 0); + } } isDownOld = isDown; } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModLootModifier.java b/src/main/java/net/mcreator/superbwarfare/init/ModLootModifier.java similarity index 98% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModLootModifier.java rename to src/main/java/net/mcreator/superbwarfare/init/ModLootModifier.java index 81b44cae3..71436f0a6 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModLootModifier.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModLootModifier.java @@ -23,7 +23,7 @@ import net.minecraftforge.registries.RegistryObject; import java.util.function.Supplier; @Mod.EventBusSubscriber(modid = ModUtils.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class TargetModLootModifier { +public class ModLootModifier { public static class TargetModLootTableModifier extends LootModifier { public static final Supplier> CODEC = Suppliers .memoize(() -> RecordCodecBuilder.create(instance -> codecStart(instance).and(ResourceLocation.CODEC.fieldOf("lootTable").forGetter(m -> m.lootTable)).apply(instance, TargetModLootTableModifier::new))); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModMenus.java b/src/main/java/net/mcreator/superbwarfare/init/ModMenus.java similarity index 96% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModMenus.java rename to src/main/java/net/mcreator/superbwarfare/init/ModMenus.java index a3da65b34..ca4e12680 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModMenus.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModMenus.java @@ -8,7 +8,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class TargetModMenus { +public class ModMenus { public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.MENU_TYPES, ModUtils.MODID); public static final RegistryObject> GUN_RECYCLE_GUI = REGISTRY.register("gun_recycle_gui", () -> IForgeMenuType.create(GunRecycleGuiMenu::new)); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModMobEffects.java b/src/main/java/net/mcreator/superbwarfare/init/ModMobEffects.java similarity index 94% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModMobEffects.java rename to src/main/java/net/mcreator/superbwarfare/init/ModMobEffects.java index 286473665..610d5df70 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModMobEffects.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModMobEffects.java @@ -7,7 +7,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class TargetModMobEffects { +public class ModMobEffects { public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.MOB_EFFECTS, ModUtils.MODID); public static final RegistryObject SHOCK = REGISTRY.register("shock", ShockMobEffect::new); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModModels.java b/src/main/java/net/mcreator/superbwarfare/init/ModModels.java similarity index 97% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModModels.java rename to src/main/java/net/mcreator/superbwarfare/init/ModModels.java index 39045acdb..4b86bd46d 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModModels.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModModels.java @@ -7,7 +7,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT}) -public class TargetModModels { +public class ModModels { @SubscribeEvent public static void registerLayerDefinitions(EntityRenderersEvent.RegisterLayerDefinitions event) { event.registerLayerDefinition(ModelRPGRocket.LAYER_LOCATION, ModelRPGRocket::createBodyLayer); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModParticleTypes.java b/src/main/java/net/mcreator/superbwarfare/init/ModParticleTypes.java similarity index 95% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModParticleTypes.java rename to src/main/java/net/mcreator/superbwarfare/init/ModParticleTypes.java index 0619c2a30..3b6c9d36f 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModParticleTypes.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModParticleTypes.java @@ -7,7 +7,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class TargetModParticleTypes { +public class ModParticleTypes { public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, ModUtils.MODID); public static final RegistryObject FIRE_STAR = REGISTRY.register("fire_star", () -> new SimpleParticleType(false)); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModParticles.java b/src/main/java/net/mcreator/superbwarfare/init/ModParticles.java similarity index 71% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModParticles.java rename to src/main/java/net/mcreator/superbwarfare/init/ModParticles.java index 5d3014036..74270e950 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModParticles.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModParticles.java @@ -8,11 +8,11 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public class TargetModParticles { +public class ModParticles { @SubscribeEvent public static void registerParticles(RegisterParticleProvidersEvent event) { - event.registerSpriteSet(TargetModParticleTypes.FIRE_STAR.get(), FireStarParticle::provider); - event.registerSpriteSet(TargetModParticleTypes.BULLET_HOLE.get(), BulletHoleParticle::provider); + event.registerSpriteSet(ModParticleTypes.FIRE_STAR.get(), FireStarParticle::provider); + event.registerSpriteSet(ModParticleTypes.BULLET_HOLE.get(), BulletHoleParticle::provider); } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModPotion.java b/src/main/java/net/mcreator/superbwarfare/init/ModPotion.java similarity index 61% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModPotion.java rename to src/main/java/net/mcreator/superbwarfare/init/ModPotion.java index 3185ce16f..3b844db0f 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModPotion.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModPotion.java @@ -7,13 +7,13 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class TargetModPotion { +public class ModPotion { public static final DeferredRegister POTIONS = DeferredRegister.create(ForgeRegistries.POTIONS, ModUtils.MODID); - public static final RegistryObject SHOCK= POTIONS.register("target_shock", - () -> new Potion(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, 0))); - public static final RegistryObject STRONG_SHOCK = POTIONS.register("target_strong_shock", - () -> new Potion(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, 1))); - public static final RegistryObject LONG_SHOCK = POTIONS.register("target_long_shock", - () -> new Potion(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 400, 0))); + public static final RegistryObject SHOCK= POTIONS.register("superbwarfare_shock", + () -> new Potion(new MobEffectInstance(ModMobEffects.SHOCK.get(), 100, 0))); + public static final RegistryObject STRONG_SHOCK = POTIONS.register("superbwarfare_strong_shock", + () -> new Potion(new MobEffectInstance(ModMobEffects.SHOCK.get(), 100, 1))); + public static final RegistryObject LONG_SHOCK = POTIONS.register("superbwarfare_long_shock", + () -> new Potion(new MobEffectInstance(ModMobEffects.SHOCK.get(), 400, 0))); } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModProperties.java b/src/main/java/net/mcreator/superbwarfare/init/ModProperties.java similarity index 81% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModProperties.java rename to src/main/java/net/mcreator/superbwarfare/init/ModProperties.java index 27439a8fa..29543d83b 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModProperties.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModProperties.java @@ -9,10 +9,10 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.mcreator.superbwarfare.tools.ItemNBTTool; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public class TargetModProperties { +public class ModProperties { @SubscribeEvent public static void propertyOverrideRegistry(FMLClientSetupEvent event) { - event.enqueueWork(() -> ItemProperties.register(TargetModItems.MONITOR.get(), new ResourceLocation("target", "monitor_linked"), + event.enqueueWork(() -> ItemProperties.register(ModItems.MONITOR.get(), new ResourceLocation("superbwarfare", "monitor_linked"), (itemStack, clientWorld, livingEntity, seed) -> ItemNBTTool.getBoolean(itemStack, "Linked", false) ? 1.0F : 0.0F)); } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModScreens.java b/src/main/java/net/mcreator/superbwarfare/init/ModScreens.java similarity index 82% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModScreens.java rename to src/main/java/net/mcreator/superbwarfare/init/ModScreens.java index 034bc8209..e6fe4e9ab 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModScreens.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModScreens.java @@ -8,11 +8,11 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public class TargetModScreens { +public class ModScreens { @SubscribeEvent public static void clientLoad(FMLClientSetupEvent event) { event.enqueueWork(() -> { - MenuScreens.register(TargetModMenus.GUN_RECYCLE_GUI.get(), GunRecycleGuiScreen::new); + MenuScreens.register(ModMenus.GUN_RECYCLE_GUI.get(), GunRecycleGuiScreen::new); }); } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModSounds.java b/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java similarity index 63% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModSounds.java rename to src/main/java/net/mcreator/superbwarfare/init/ModSounds.java index 14b38a476..7d2bdd9d4 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java @@ -8,188 +8,188 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @SuppressWarnings("unused") -public class TargetModSounds { +public class ModSounds { public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, ModUtils.MODID); - public static final RegistryObject TASER_FIRE_1P = REGISTRY.register("taser_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_1p"))); - public static final RegistryObject TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_3p"))); - public static final RegistryObject TASER_RELOAD_EMPTY = REGISTRY.register("taser_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_reload_empty"))); - public static final RegistryObject SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shock"))); - public static final RegistryObject ELECTRIC = REGISTRY.register("electric", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "electric"))); - public static final RegistryObject TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_1p"))); - public static final RegistryObject TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_3p"))); - public static final RegistryObject TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_far"))); - public static final RegistryObject TRACHELIUM_VERYFAR = REGISTRY.register("trachelium_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_veryfar"))); - public static final RegistryObject TRACHELIUM_RELOAD_EMPTY = REGISTRY.register("trachelium_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_reload_empty"))); - public static final RegistryObject TRIGGER_CLICK = REGISTRY.register("triggerclick", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "triggerclick"))); - public static final RegistryObject HIT = REGISTRY.register("hit", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hit"))); - public static final RegistryObject TARGET_DOWN = REGISTRY.register("targetdown", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "targetdown"))); - public static final RegistryObject INDICATION = REGISTRY.register("indication", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "indication"))); - public static final RegistryObject JUMP = REGISTRY.register("jump", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "jump"))); - public static final RegistryObject DOUBLE_JUMP = REGISTRY.register("doublejump", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "doublejump"))); - public static final RegistryObject EXPLOSION_CLOSE = REGISTRY.register("explosion_close", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "explosion_close"))); - public static final RegistryObject EXPLOSION_FAR = REGISTRY.register("explosion_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "explosion_far"))); - public static final RegistryObject EXPLOSION_VERY_FAR = REGISTRY.register("explosion_very_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "explosion_very_far"))); - public static final RegistryObject EXPLOSION_WATER = REGISTRY.register("explosion_water", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "explosion_water"))); - public static final RegistryObject HUNTING_RIFLE_FIRE_1P = REGISTRY.register("hunting_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_fire_1p"))); - public static final RegistryObject HUNTING_RIFLE_FIRE_3P = REGISTRY.register("hunting_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_fire_3p"))); - public static final RegistryObject HUNTING_RIFLE_FAR = REGISTRY.register("hunting_rifle_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_far"))); - public static final RegistryObject HUNTING_RIFLE_VERYFAR = REGISTRY.register("hunting_rifle_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_veryfar"))); - public static final RegistryObject HUNTING_RIFLE_RELOAD_EMPTY = REGISTRY.register("hunting_rifle_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_reload_empty"))); - public static final RegistryObject OUCH = REGISTRY.register("ouch", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ouch"))); - public static final RegistryObject STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "step"))); - public static final RegistryObject GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "growl"))); - public static final RegistryObject IDLE = REGISTRY.register("idle", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "idle"))); - public static final RegistryObject M_79_FIRE_1P = REGISTRY.register("m_79_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_fire_1p"))); - public static final RegistryObject M_79_FIRE_3P = REGISTRY.register("m_79_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_fire_3p"))); - public static final RegistryObject M_79_FAR = REGISTRY.register("m_79_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_far"))); - public static final RegistryObject M_79_VERYFAR = REGISTRY.register("m_79_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_veryfar"))); - public static final RegistryObject M_79_RELOAD_EMPTY = REGISTRY.register("m_79_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_reload_empty"))); - public static final RegistryObject SKS_FIRE_1P = REGISTRY.register("sks_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_fire_1p"))); - public static final RegistryObject SKS_FIRE_3P = REGISTRY.register("sks_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_fire_3p"))); - public static final RegistryObject SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_reload_normal"))); - public static final RegistryObject SKS_RELOAD_EMPTY = REGISTRY.register("sks_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_reload_empty"))); - public static final RegistryObject SKS_FAR = REGISTRY.register("sks_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_far"))); - public static final RegistryObject SKS_VERYFAR = REGISTRY.register("sks_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_veryfar"))); - public static final RegistryObject ABEKIRI_FIRE_1P = REGISTRY.register("abekiri_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_fire_1p"))); - public static final RegistryObject ABEKIRI_FIRE_3P = REGISTRY.register("abekiri_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_fire_3p"))); - public static final RegistryObject ABEKIRI_FAR = REGISTRY.register("abekiri_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_far"))); - public static final RegistryObject ABEKIRI_VERYFAR = REGISTRY.register("abekiri_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_veryfar"))); - public static final RegistryObject ABEKIRI_RELOAD_NORMAL = REGISTRY.register("abekiri_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_reload_normal"))); - public static final RegistryObject ABEKIRI_RELOAD_EMPTY = REGISTRY.register("abekiri_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_reload_empty"))); - public static final RegistryObject AK_47_FIRE_1P = REGISTRY.register("ak_47_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_47_fire_1p"))); - public static final RegistryObject AK_47_FIRE_3P = REGISTRY.register("ak_47_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_47_fire_3p"))); - public static final RegistryObject AK_47_FAR = REGISTRY.register("ak_47_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_47_far"))); - public static final RegistryObject AK_47_VERYFAR = REGISTRY.register("ak_47_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_47_veryfar"))); - public static final RegistryObject AK_47_RELOAD_NORMAL = REGISTRY.register("ak_47_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_47_reload_normal"))); - public static final RegistryObject AK_47_RELOAD_EMPTY = REGISTRY.register("ak_47_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_47_reload_empty"))); - public static final RegistryObject LAND = REGISTRY.register("land", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "land"))); - public static final RegistryObject HEADSHOT = REGISTRY.register("headshot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "headshot"))); - public static final RegistryObject DEVOTION_FIRE_1P = REGISTRY.register("devotion_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_fire_1p"))); - public static final RegistryObject DEVOTION_FIRE_3P = REGISTRY.register("devotion_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_fire_3p"))); - public static final RegistryObject DEVOTION_FAR = REGISTRY.register("devotion_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_far"))); - public static final RegistryObject DEVOTION_VERYFAR = REGISTRY.register("devotion_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_veryfar"))); - public static final RegistryObject DEVOTION_RELOAD_NORMAL = REGISTRY.register("devotion_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_reload_normal"))); - public static final RegistryObject DEVOTION_RELOAD_EMPTY = REGISTRY.register("devotion_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_reload_empty"))); - public static final RegistryObject RPG_FIRE_1P = REGISTRY.register("rpg_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_fire_1p"))); - public static final RegistryObject RPG_FIRE_3P = REGISTRY.register("rpg_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_fire_3p"))); - public static final RegistryObject RPG_FAR = REGISTRY.register("rpg_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_far"))); - public static final RegistryObject RPG_VERYFAR = REGISTRY.register("rpg_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_veryfar"))); - public static final RegistryObject RPG_RELOAD_EMPTY = REGISTRY.register("rpg_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_reload_empty"))); - public static final RegistryObject MORTAR_FIRE = REGISTRY.register("mortar_fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_fire"))); - public static final RegistryObject MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_load"))); - public static final RegistryObject MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_distant"))); - public static final RegistryObject FIRE_RATE = REGISTRY.register("firerate", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "firerate"))); - public static final RegistryObject M_4_FIRE_1P = REGISTRY.register("m_4_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_fire_1p"))); - public static final RegistryObject M_4_FIRE_3P = REGISTRY.register("m_4_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_fire_3p"))); - public static final RegistryObject M_4_FAR = REGISTRY.register("m_4_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_far"))); - public static final RegistryObject M_4_VERYFAR = REGISTRY.register("m_4_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_veryfar"))); - public static final RegistryObject M_4_RELOAD_NORMAL = REGISTRY.register("m_4_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_reload_normal"))); - public static final RegistryObject M_4_RELOAD_EMPTY = REGISTRY.register("m_4_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_reload_empty"))); - public static final RegistryObject AA_12_FIRE_1P = REGISTRY.register("aa_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_fire_1p"))); - public static final RegistryObject AA_12_FIRE_3P = REGISTRY.register("aa_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_fire_3p"))); - public static final RegistryObject AA_12_FAR = REGISTRY.register("aa_12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_far"))); - public static final RegistryObject AA_12_VERYFAR = REGISTRY.register("aa_12_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_veryfar"))); - public static final RegistryObject AA_12_RELOAD_NORMAL = REGISTRY.register("aa_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_reload_normal"))); - public static final RegistryObject AA_12_RELOAD_EMPTY = REGISTRY.register("aa_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_reload_empty"))); - public static final RegistryObject BOCEK_ZOOM_FIRE_1P = REGISTRY.register("bocek_zoom_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_zoom_fire_1p"))); - public static final RegistryObject BOCEK_ZOOM_FIRE_3P = REGISTRY.register("bocek_zoom_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_zoom_fire_3p"))); - public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_1P = REGISTRY.register("bocek_shatter_cap_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_shatter_cap_fire_1p"))); - public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_3P = REGISTRY.register("bocek_shatter_cap_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_shatter_cap_fire_3p"))); - public static final RegistryObject BOCEK_PULL_1P = REGISTRY.register("bocek_pull_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_pull_1p"))); - public static final RegistryObject BOCEK_PULL_3P = REGISTRY.register("bocek_pull_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_pull_3p"))); - public static final RegistryObject HK_416_FIRE_1P = REGISTRY.register("hk_416_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_416_fire_1p"))); - public static final RegistryObject HK_416_FIRE_3P = REGISTRY.register("hk_416_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_416_fire_3p"))); - public static final RegistryObject HK_416_FAR = REGISTRY.register("hk_416_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_416_far"))); - public static final RegistryObject HK_416_VERYFAR = REGISTRY.register("hk_416_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_416_veryfar"))); - public static final RegistryObject HK_416_RELOAD_NORMAL = REGISTRY.register("hk_416_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_416_reload_normal"))); - public static final RegistryObject HK_416_RELOAD_EMPTY = REGISTRY.register("hk_416_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_416_reload_empty"))); - public static final RegistryObject RPK_FIRE_1P = REGISTRY.register("rpk_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_fire_1p"))); - public static final RegistryObject RPK_FIRE_3P = REGISTRY.register("rpk_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_fire_3p"))); - public static final RegistryObject RPK_FAR = REGISTRY.register("rpk_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_far"))); - public static final RegistryObject RPK_VERYFAR = REGISTRY.register("rpk_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_veryfar"))); - public static final RegistryObject RPK_RELOAD_NORMAL = REGISTRY.register("rpk_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_reload_normal"))); - public static final RegistryObject RPK_RELOAD_EMPTY = REGISTRY.register("rpk_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_reload_empty"))); - public static final RegistryObject NTW_20_FIRE_1P = REGISTRY.register("ntw_20_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_fire_1p"))); - public static final RegistryObject NTW_20_FIRE_3P = REGISTRY.register("ntw_20_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_fire_3p"))); - public static final RegistryObject NTW_20_FAR = REGISTRY.register("ntw_20_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_far"))); - public static final RegistryObject NTW_20_VERYFAR = REGISTRY.register("ntw_20_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_veryfar"))); - public static final RegistryObject NTW_20_RELOAD_NORMAL = REGISTRY.register("ntw_20_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_reload_normal"))); - public static final RegistryObject NTW_20_RELOAD_EMPTY = REGISTRY.register("ntw_20_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_reload_empty"))); - public static final RegistryObject NTW_20_BOLT = REGISTRY.register("ntw_20_bolt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ntw_20_bolt"))); - public static final RegistryObject VECTOR_FIRE_1P = REGISTRY.register("vector_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_fire_1p"))); - public static final RegistryObject VECTOR_FIRE_3P = REGISTRY.register("vector_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_fire_3p"))); - public static final RegistryObject VECTOR_FAR = REGISTRY.register("vector_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_far"))); - public static final RegistryObject VECTOR_VERYFAR = REGISTRY.register("vector_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_veryfar"))); - public static final RegistryObject VECTOR_RELOAD_NORMAL = REGISTRY.register("vector_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_reload_normal"))); - public static final RegistryObject VECTOR_RELOAD_EMPTY = REGISTRY.register("vector_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_reload_empty"))); - public static final RegistryObject MINIGUN_FIRE_1P = REGISTRY.register("minigun_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_fire_1p"))); - public static final RegistryObject MINIGUN_FIRE_3P = REGISTRY.register("minigun_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_fire_3p"))); - public static final RegistryObject MINIGUN_FAR = REGISTRY.register("minigun_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_far"))); - public static final RegistryObject MINIGUN_VERYFAR = REGISTRY.register("minigun_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_veryfar"))); - public static final RegistryObject MINIGUN_ROT = REGISTRY.register("minigun_rot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_rot"))); - public static final RegistryObject MINIGUN_OVERHEAT = REGISTRY.register("minigun_overheat", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_overheat"))); - public static final RegistryObject MK_14_FIRE_1P = REGISTRY.register("mk_14_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_fire_1p"))); - public static final RegistryObject MK_14_FIRE_3P = REGISTRY.register("mk_14_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_fire_3p"))); - public static final RegistryObject MK_14_FAR = REGISTRY.register("mk_14_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_far"))); - public static final RegistryObject MK_14_VERYFAR = REGISTRY.register("mk_14_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_veryfar"))); - public static final RegistryObject MK_14_RELOAD_NORMAL = REGISTRY.register("mk_14_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_reload_normal"))); - public static final RegistryObject MK_14_RELOAD_EMPTY = REGISTRY.register("mk_14_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_reload_empty"))); - public static final RegistryObject SENTINEL_FIRE_1P = REGISTRY.register("sentinel_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_fire_1p"))); - public static final RegistryObject SENTINEL_FIRE_3P = REGISTRY.register("sentinel_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_fire_3p"))); - public static final RegistryObject SENTINEL_CHARGE_FIRE_1P = REGISTRY.register("sentinel_charge_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_fire_1p"))); - public static final RegistryObject SENTINEL_CHARGE_FIRE_3P = REGISTRY.register("sentinel_charge_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_fire_3p"))); - public static final RegistryObject SENTINEL_FAR = REGISTRY.register("sentinel_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_far"))); - public static final RegistryObject SENTINEL_VERYFAR = REGISTRY.register("sentinel_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_veryfar"))); - public static final RegistryObject SENTINEL_CHARGE_FAR = REGISTRY.register("sentinel_charge_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_far"))); - public static final RegistryObject SENTINEL_CHARGE_VERYFAR = REGISTRY.register("sentinel_charge_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_veryfar"))); - public static final RegistryObject SENTINEL_RELOAD_NORMAL = REGISTRY.register("sentinel_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_reload_normal"))); - public static final RegistryObject SENTINEL_RELOAD_EMPTY = REGISTRY.register("sentinel_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_reload_empty"))); - public static final RegistryObject SENTINEL_CHARGE = REGISTRY.register("sentinel_charge", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge"))); - public static final RegistryObject SENTINEL_BOLT = REGISTRY.register("sentinel_bolt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_bolt"))); - public static final RegistryObject M_60_FIRE_1P = REGISTRY.register("m_60_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_fire_1p"))); - public static final RegistryObject M_60_FIRE_3P = REGISTRY.register("m_60_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_fire_3p"))); - public static final RegistryObject M_60_FAR = REGISTRY.register("m_60_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_far"))); - public static final RegistryObject M_60_VERYFAR = REGISTRY.register("m_60_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_veryfar"))); - public static final RegistryObject M_60_RELOAD_NORMAL = REGISTRY.register("m_60_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_reload_normal"))); - public static final RegistryObject M_60_RELOAD_EMPTY = REGISTRY.register("m_60_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_reload_empty"))); - public static final RegistryObject LIGHT_SABER = REGISTRY.register("lightsaber", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "lightsaber"))); - public static final RegistryObject SVD_FIRE_1P = REGISTRY.register("svd_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_fire_1p"))); - public static final RegistryObject SVD_FIRE_3P = REGISTRY.register("svd_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_fire_3p"))); - public static final RegistryObject SVD_FAR = REGISTRY.register("svd_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_far"))); - public static final RegistryObject SVD_VERYFAR = REGISTRY.register("svd_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_veryfar"))); - public static final RegistryObject SVD_RELOAD_NORMAL = REGISTRY.register("svd_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_reload_normal"))); - public static final RegistryObject SVD_RELOAD_EMPTY = REGISTRY.register("svd_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_reload_empty"))); - public static final RegistryObject M_98B_FIRE_1P = REGISTRY.register("m_98b_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_fire_1p"))); - public static final RegistryObject M_98B_FIRE_3P = REGISTRY.register("m_98b_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_fire_3p"))); - public static final RegistryObject M_98B_FAR = REGISTRY.register("m_98b_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_far"))); - public static final RegistryObject M_98B_VERYFAR = REGISTRY.register("m_98b_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_veryfar"))); - public static final RegistryObject M_98B_RELOAD_NORMAL = REGISTRY.register("m_98b_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_reload_normal"))); - public static final RegistryObject M_98B_RELOAD_EMPTY = REGISTRY.register("m_98b_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_reload_empty"))); - public static final RegistryObject M_98B_BOLT = REGISTRY.register("m_98b_bolt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_bolt"))); - public static final RegistryObject MARLIN_FIRE_1P = REGISTRY.register("marlin_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_fire_1p"))); - public static final RegistryObject MARLIN_FIRE_3P = REGISTRY.register("marlin_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_fire_3p"))); - public static final RegistryObject MARLIN_FAR = REGISTRY.register("marlin_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_far"))); - public static final RegistryObject MARLIN_VERYFAR = REGISTRY.register("marlin_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_veryfar"))); - public static final RegistryObject MARLIN_PREPARE = REGISTRY.register("marlin_prepare", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_prepare"))); - public static final RegistryObject MARLIN_LOOP = REGISTRY.register("marlin_loop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_loop"))); - public static final RegistryObject MARLIN_END = REGISTRY.register("marlin_end", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_end"))); - public static final RegistryObject M_870_FIRE_1P = REGISTRY.register("m_870_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_fire_1p"))); - public static final RegistryObject M_870_FIRE_3P = REGISTRY.register("m_870_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_fire_3p"))); - public static final RegistryObject M_870_FAR = REGISTRY.register("m_870_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_far"))); - public static final RegistryObject M_870_VERYFAR = REGISTRY.register("m_870_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_veryfar"))); - public static final RegistryObject M_870_PREPARE_LOAD = REGISTRY.register("m_870_prepare_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_prepare_load"))); - public static final RegistryObject M_870_LOOP = REGISTRY.register("m_870_loop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_loop"))); + public static final RegistryObject TASER_FIRE_1P = REGISTRY.register("taser_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "taser_fire_1p"))); + public static final RegistryObject TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "taser_fire_3p"))); + public static final RegistryObject TASER_RELOAD_EMPTY = REGISTRY.register("taser_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "taser_reload_empty"))); + public static final RegistryObject SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "shock"))); + public static final RegistryObject ELECTRIC = REGISTRY.register("electric", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "electric"))); + public static final RegistryObject TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "trachelium_fire_1p"))); + public static final RegistryObject TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "trachelium_fire_3p"))); + public static final RegistryObject TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "trachelium_far"))); + public static final RegistryObject TRACHELIUM_VERYFAR = REGISTRY.register("trachelium_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "trachelium_veryfar"))); + public static final RegistryObject TRACHELIUM_RELOAD_EMPTY = REGISTRY.register("trachelium_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "trachelium_reload_empty"))); + public static final RegistryObject TRIGGER_CLICK = REGISTRY.register("triggerclick", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "triggerclick"))); + public static final RegistryObject HIT = REGISTRY.register("hit", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hit"))); + public static final RegistryObject TARGET_DOWN = REGISTRY.register("targetdown", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "targetdown"))); + public static final RegistryObject INDICATION = REGISTRY.register("indication", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "indication"))); + public static final RegistryObject JUMP = REGISTRY.register("jump", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "jump"))); + public static final RegistryObject DOUBLE_JUMP = REGISTRY.register("doublejump", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "doublejump"))); + public static final RegistryObject EXPLOSION_CLOSE = REGISTRY.register("explosion_close", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "explosion_close"))); + public static final RegistryObject EXPLOSION_FAR = REGISTRY.register("explosion_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "explosion_far"))); + public static final RegistryObject EXPLOSION_VERY_FAR = REGISTRY.register("explosion_very_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "explosion_very_far"))); + public static final RegistryObject EXPLOSION_WATER = REGISTRY.register("explosion_water", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "explosion_water"))); + public static final RegistryObject HUNTING_RIFLE_FIRE_1P = REGISTRY.register("hunting_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hunting_rifle_fire_1p"))); + public static final RegistryObject HUNTING_RIFLE_FIRE_3P = REGISTRY.register("hunting_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hunting_rifle_fire_3p"))); + public static final RegistryObject HUNTING_RIFLE_FAR = REGISTRY.register("hunting_rifle_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hunting_rifle_far"))); + public static final RegistryObject HUNTING_RIFLE_VERYFAR = REGISTRY.register("hunting_rifle_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hunting_rifle_veryfar"))); + public static final RegistryObject HUNTING_RIFLE_RELOAD_EMPTY = REGISTRY.register("hunting_rifle_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hunting_rifle_reload_empty"))); + public static final RegistryObject OUCH = REGISTRY.register("ouch", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ouch"))); + public static final RegistryObject STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "step"))); + public static final RegistryObject GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "growl"))); + public static final RegistryObject IDLE = REGISTRY.register("idle", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "idle"))); + public static final RegistryObject M_79_FIRE_1P = REGISTRY.register("m_79_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_79_fire_1p"))); + public static final RegistryObject M_79_FIRE_3P = REGISTRY.register("m_79_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_79_fire_3p"))); + public static final RegistryObject M_79_FAR = REGISTRY.register("m_79_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_79_far"))); + public static final RegistryObject M_79_VERYFAR = REGISTRY.register("m_79_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_79_veryfar"))); + public static final RegistryObject M_79_RELOAD_EMPTY = REGISTRY.register("m_79_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_79_reload_empty"))); + public static final RegistryObject SKS_FIRE_1P = REGISTRY.register("sks_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sks_fire_1p"))); + public static final RegistryObject SKS_FIRE_3P = REGISTRY.register("sks_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sks_fire_3p"))); + public static final RegistryObject SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sks_reload_normal"))); + public static final RegistryObject SKS_RELOAD_EMPTY = REGISTRY.register("sks_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sks_reload_empty"))); + public static final RegistryObject SKS_FAR = REGISTRY.register("sks_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sks_far"))); + public static final RegistryObject SKS_VERYFAR = REGISTRY.register("sks_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sks_veryfar"))); + public static final RegistryObject ABEKIRI_FIRE_1P = REGISTRY.register("abekiri_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "abekiri_fire_1p"))); + public static final RegistryObject ABEKIRI_FIRE_3P = REGISTRY.register("abekiri_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "abekiri_fire_3p"))); + public static final RegistryObject ABEKIRI_FAR = REGISTRY.register("abekiri_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "abekiri_far"))); + public static final RegistryObject ABEKIRI_VERYFAR = REGISTRY.register("abekiri_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "abekiri_veryfar"))); + public static final RegistryObject ABEKIRI_RELOAD_NORMAL = REGISTRY.register("abekiri_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "abekiri_reload_normal"))); + public static final RegistryObject ABEKIRI_RELOAD_EMPTY = REGISTRY.register("abekiri_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "abekiri_reload_empty"))); + public static final RegistryObject AK_47_FIRE_1P = REGISTRY.register("ak_47_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ak_47_fire_1p"))); + public static final RegistryObject AK_47_FIRE_3P = REGISTRY.register("ak_47_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ak_47_fire_3p"))); + public static final RegistryObject AK_47_FAR = REGISTRY.register("ak_47_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ak_47_far"))); + public static final RegistryObject AK_47_VERYFAR = REGISTRY.register("ak_47_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ak_47_veryfar"))); + public static final RegistryObject AK_47_RELOAD_NORMAL = REGISTRY.register("ak_47_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ak_47_reload_normal"))); + public static final RegistryObject AK_47_RELOAD_EMPTY = REGISTRY.register("ak_47_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ak_47_reload_empty"))); + public static final RegistryObject LAND = REGISTRY.register("land", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "land"))); + public static final RegistryObject HEADSHOT = REGISTRY.register("headshot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "headshot"))); + public static final RegistryObject DEVOTION_FIRE_1P = REGISTRY.register("devotion_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "devotion_fire_1p"))); + public static final RegistryObject DEVOTION_FIRE_3P = REGISTRY.register("devotion_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "devotion_fire_3p"))); + public static final RegistryObject DEVOTION_FAR = REGISTRY.register("devotion_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "devotion_far"))); + public static final RegistryObject DEVOTION_VERYFAR = REGISTRY.register("devotion_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "devotion_veryfar"))); + public static final RegistryObject DEVOTION_RELOAD_NORMAL = REGISTRY.register("devotion_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "devotion_reload_normal"))); + public static final RegistryObject DEVOTION_RELOAD_EMPTY = REGISTRY.register("devotion_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "devotion_reload_empty"))); + public static final RegistryObject RPG_FIRE_1P = REGISTRY.register("rpg_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpg_fire_1p"))); + public static final RegistryObject RPG_FIRE_3P = REGISTRY.register("rpg_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpg_fire_3p"))); + public static final RegistryObject RPG_FAR = REGISTRY.register("rpg_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpg_far"))); + public static final RegistryObject RPG_VERYFAR = REGISTRY.register("rpg_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpg_veryfar"))); + public static final RegistryObject RPG_RELOAD_EMPTY = REGISTRY.register("rpg_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpg_reload_empty"))); + public static final RegistryObject MORTAR_FIRE = REGISTRY.register("mortar_fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mortar_fire"))); + public static final RegistryObject MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mortar_load"))); + public static final RegistryObject MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mortar_distant"))); + public static final RegistryObject FIRE_RATE = REGISTRY.register("firerate", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "firerate"))); + public static final RegistryObject M_4_FIRE_1P = REGISTRY.register("m_4_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_4_fire_1p"))); + public static final RegistryObject M_4_FIRE_3P = REGISTRY.register("m_4_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_4_fire_3p"))); + public static final RegistryObject M_4_FAR = REGISTRY.register("m_4_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_4_far"))); + public static final RegistryObject M_4_VERYFAR = REGISTRY.register("m_4_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_4_veryfar"))); + public static final RegistryObject M_4_RELOAD_NORMAL = REGISTRY.register("m_4_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_4_reload_normal"))); + public static final RegistryObject M_4_RELOAD_EMPTY = REGISTRY.register("m_4_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_4_reload_empty"))); + public static final RegistryObject AA_12_FIRE_1P = REGISTRY.register("aa_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "aa_12_fire_1p"))); + public static final RegistryObject AA_12_FIRE_3P = REGISTRY.register("aa_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "aa_12_fire_3p"))); + public static final RegistryObject AA_12_FAR = REGISTRY.register("aa_12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "aa_12_far"))); + public static final RegistryObject AA_12_VERYFAR = REGISTRY.register("aa_12_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "aa_12_veryfar"))); + public static final RegistryObject AA_12_RELOAD_NORMAL = REGISTRY.register("aa_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "aa_12_reload_normal"))); + public static final RegistryObject AA_12_RELOAD_EMPTY = REGISTRY.register("aa_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "aa_12_reload_empty"))); + public static final RegistryObject BOCEK_ZOOM_FIRE_1P = REGISTRY.register("bocek_zoom_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bocek_zoom_fire_1p"))); + public static final RegistryObject BOCEK_ZOOM_FIRE_3P = REGISTRY.register("bocek_zoom_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bocek_zoom_fire_3p"))); + public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_1P = REGISTRY.register("bocek_shatter_cap_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bocek_shatter_cap_fire_1p"))); + public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_3P = REGISTRY.register("bocek_shatter_cap_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bocek_shatter_cap_fire_3p"))); + public static final RegistryObject BOCEK_PULL_1P = REGISTRY.register("bocek_pull_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bocek_pull_1p"))); + public static final RegistryObject BOCEK_PULL_3P = REGISTRY.register("bocek_pull_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bocek_pull_3p"))); + public static final RegistryObject HK_416_FIRE_1P = REGISTRY.register("hk_416_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hk_416_fire_1p"))); + public static final RegistryObject HK_416_FIRE_3P = REGISTRY.register("hk_416_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hk_416_fire_3p"))); + public static final RegistryObject HK_416_FAR = REGISTRY.register("hk_416_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hk_416_far"))); + public static final RegistryObject HK_416_VERYFAR = REGISTRY.register("hk_416_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hk_416_veryfar"))); + public static final RegistryObject HK_416_RELOAD_NORMAL = REGISTRY.register("hk_416_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hk_416_reload_normal"))); + public static final RegistryObject HK_416_RELOAD_EMPTY = REGISTRY.register("hk_416_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "hk_416_reload_empty"))); + public static final RegistryObject RPK_FIRE_1P = REGISTRY.register("rpk_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpk_fire_1p"))); + public static final RegistryObject RPK_FIRE_3P = REGISTRY.register("rpk_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpk_fire_3p"))); + public static final RegistryObject RPK_FAR = REGISTRY.register("rpk_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpk_far"))); + public static final RegistryObject RPK_VERYFAR = REGISTRY.register("rpk_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpk_veryfar"))); + public static final RegistryObject RPK_RELOAD_NORMAL = REGISTRY.register("rpk_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpk_reload_normal"))); + public static final RegistryObject RPK_RELOAD_EMPTY = REGISTRY.register("rpk_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "rpk_reload_empty"))); + public static final RegistryObject NTW_20_FIRE_1P = REGISTRY.register("ntw_20_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_fire_1p"))); + public static final RegistryObject NTW_20_FIRE_3P = REGISTRY.register("ntw_20_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_fire_3p"))); + public static final RegistryObject NTW_20_FAR = REGISTRY.register("ntw_20_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_far"))); + public static final RegistryObject NTW_20_VERYFAR = REGISTRY.register("ntw_20_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_veryfar"))); + public static final RegistryObject NTW_20_RELOAD_NORMAL = REGISTRY.register("ntw_20_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_reload_normal"))); + public static final RegistryObject NTW_20_RELOAD_EMPTY = REGISTRY.register("ntw_20_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_reload_empty"))); + public static final RegistryObject NTW_20_BOLT = REGISTRY.register("ntw_20_bolt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "ntw_20_bolt"))); + public static final RegistryObject VECTOR_FIRE_1P = REGISTRY.register("vector_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "vector_fire_1p"))); + public static final RegistryObject VECTOR_FIRE_3P = REGISTRY.register("vector_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "vector_fire_3p"))); + public static final RegistryObject VECTOR_FAR = REGISTRY.register("vector_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "vector_far"))); + public static final RegistryObject VECTOR_VERYFAR = REGISTRY.register("vector_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "vector_veryfar"))); + public static final RegistryObject VECTOR_RELOAD_NORMAL = REGISTRY.register("vector_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "vector_reload_normal"))); + public static final RegistryObject VECTOR_RELOAD_EMPTY = REGISTRY.register("vector_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "vector_reload_empty"))); + public static final RegistryObject MINIGUN_FIRE_1P = REGISTRY.register("minigun_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "minigun_fire_1p"))); + public static final RegistryObject MINIGUN_FIRE_3P = REGISTRY.register("minigun_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "minigun_fire_3p"))); + public static final RegistryObject MINIGUN_FAR = REGISTRY.register("minigun_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "minigun_far"))); + public static final RegistryObject MINIGUN_VERYFAR = REGISTRY.register("minigun_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "minigun_veryfar"))); + public static final RegistryObject MINIGUN_ROT = REGISTRY.register("minigun_rot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "minigun_rot"))); + public static final RegistryObject MINIGUN_OVERHEAT = REGISTRY.register("minigun_overheat", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "minigun_overheat"))); + public static final RegistryObject MK_14_FIRE_1P = REGISTRY.register("mk_14_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_14_fire_1p"))); + public static final RegistryObject MK_14_FIRE_3P = REGISTRY.register("mk_14_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_14_fire_3p"))); + public static final RegistryObject MK_14_FAR = REGISTRY.register("mk_14_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_14_far"))); + public static final RegistryObject MK_14_VERYFAR = REGISTRY.register("mk_14_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_14_veryfar"))); + public static final RegistryObject MK_14_RELOAD_NORMAL = REGISTRY.register("mk_14_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_14_reload_normal"))); + public static final RegistryObject MK_14_RELOAD_EMPTY = REGISTRY.register("mk_14_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_14_reload_empty"))); + public static final RegistryObject SENTINEL_FIRE_1P = REGISTRY.register("sentinel_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_fire_1p"))); + public static final RegistryObject SENTINEL_FIRE_3P = REGISTRY.register("sentinel_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_fire_3p"))); + public static final RegistryObject SENTINEL_CHARGE_FIRE_1P = REGISTRY.register("sentinel_charge_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_charge_fire_1p"))); + public static final RegistryObject SENTINEL_CHARGE_FIRE_3P = REGISTRY.register("sentinel_charge_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_charge_fire_3p"))); + public static final RegistryObject SENTINEL_FAR = REGISTRY.register("sentinel_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_far"))); + public static final RegistryObject SENTINEL_VERYFAR = REGISTRY.register("sentinel_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_veryfar"))); + public static final RegistryObject SENTINEL_CHARGE_FAR = REGISTRY.register("sentinel_charge_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_charge_far"))); + public static final RegistryObject SENTINEL_CHARGE_VERYFAR = REGISTRY.register("sentinel_charge_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_charge_veryfar"))); + public static final RegistryObject SENTINEL_RELOAD_NORMAL = REGISTRY.register("sentinel_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_reload_normal"))); + public static final RegistryObject SENTINEL_RELOAD_EMPTY = REGISTRY.register("sentinel_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_reload_empty"))); + public static final RegistryObject SENTINEL_CHARGE = REGISTRY.register("sentinel_charge", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_charge"))); + public static final RegistryObject SENTINEL_BOLT = REGISTRY.register("sentinel_bolt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "sentinel_bolt"))); + public static final RegistryObject M_60_FIRE_1P = REGISTRY.register("m_60_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_60_fire_1p"))); + public static final RegistryObject M_60_FIRE_3P = REGISTRY.register("m_60_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_60_fire_3p"))); + public static final RegistryObject M_60_FAR = REGISTRY.register("m_60_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_60_far"))); + public static final RegistryObject M_60_VERYFAR = REGISTRY.register("m_60_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_60_veryfar"))); + public static final RegistryObject M_60_RELOAD_NORMAL = REGISTRY.register("m_60_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_60_reload_normal"))); + public static final RegistryObject M_60_RELOAD_EMPTY = REGISTRY.register("m_60_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_60_reload_empty"))); + public static final RegistryObject LIGHT_SABER = REGISTRY.register("lightsaber", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "lightsaber"))); + public static final RegistryObject SVD_FIRE_1P = REGISTRY.register("svd_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "svd_fire_1p"))); + public static final RegistryObject SVD_FIRE_3P = REGISTRY.register("svd_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "svd_fire_3p"))); + public static final RegistryObject SVD_FAR = REGISTRY.register("svd_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "svd_far"))); + public static final RegistryObject SVD_VERYFAR = REGISTRY.register("svd_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "svd_veryfar"))); + public static final RegistryObject SVD_RELOAD_NORMAL = REGISTRY.register("svd_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "svd_reload_normal"))); + public static final RegistryObject SVD_RELOAD_EMPTY = REGISTRY.register("svd_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "svd_reload_empty"))); + public static final RegistryObject M_98B_FIRE_1P = REGISTRY.register("m_98b_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_fire_1p"))); + public static final RegistryObject M_98B_FIRE_3P = REGISTRY.register("m_98b_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_fire_3p"))); + public static final RegistryObject M_98B_FAR = REGISTRY.register("m_98b_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_far"))); + public static final RegistryObject M_98B_VERYFAR = REGISTRY.register("m_98b_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_veryfar"))); + public static final RegistryObject M_98B_RELOAD_NORMAL = REGISTRY.register("m_98b_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_reload_normal"))); + public static final RegistryObject M_98B_RELOAD_EMPTY = REGISTRY.register("m_98b_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_reload_empty"))); + public static final RegistryObject M_98B_BOLT = REGISTRY.register("m_98b_bolt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_98b_bolt"))); + public static final RegistryObject MARLIN_FIRE_1P = REGISTRY.register("marlin_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_fire_1p"))); + public static final RegistryObject MARLIN_FIRE_3P = REGISTRY.register("marlin_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_fire_3p"))); + public static final RegistryObject MARLIN_FAR = REGISTRY.register("marlin_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_far"))); + public static final RegistryObject MARLIN_VERYFAR = REGISTRY.register("marlin_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_veryfar"))); + public static final RegistryObject MARLIN_PREPARE = REGISTRY.register("marlin_prepare", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_prepare"))); + public static final RegistryObject MARLIN_LOOP = REGISTRY.register("marlin_loop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_loop"))); + public static final RegistryObject MARLIN_END = REGISTRY.register("marlin_end", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "marlin_end"))); + public static final RegistryObject M_870_FIRE_1P = REGISTRY.register("m_870_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_870_fire_1p"))); + public static final RegistryObject M_870_FIRE_3P = REGISTRY.register("m_870_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_870_fire_3p"))); + public static final RegistryObject M_870_FAR = REGISTRY.register("m_870_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_870_far"))); + public static final RegistryObject M_870_VERYFAR = REGISTRY.register("m_870_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_870_veryfar"))); + public static final RegistryObject M_870_PREPARE_LOAD = REGISTRY.register("m_870_prepare_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_870_prepare_load"))); + public static final RegistryObject M_870_LOOP = REGISTRY.register("m_870_loop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "m_870_loop"))); - public static final RegistryObject MK_42_FIRE_1P = REGISTRY.register("mk_42_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_42_fire_1p"))); - public static final RegistryObject MK_42_FIRE_3P = REGISTRY.register("mk_42_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_42_fire_3p"))); - public static final RegistryObject MK_42_FAR = REGISTRY.register("mk_42_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_42_far"))); - public static final RegistryObject MK_42_VERYFAR = REGISTRY.register("mk_42_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_42_veryfar"))); - public static final RegistryObject MK_42_RELOAD = REGISTRY.register("mk_42_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_42_reload"))); - public static final RegistryObject CANNON_ZOOM_IN = REGISTRY.register("cannon_zoom_in", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "cannon_zoom_in"))); - public static final RegistryObject CANNON_ZOOM_OUT = REGISTRY.register("cannon_zoom_out", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "cannon_zoom_out"))); + public static final RegistryObject MK_42_FIRE_1P = REGISTRY.register("mk_42_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_42_fire_1p"))); + public static final RegistryObject MK_42_FIRE_3P = REGISTRY.register("mk_42_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_42_fire_3p"))); + public static final RegistryObject MK_42_FAR = REGISTRY.register("mk_42_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_42_far"))); + public static final RegistryObject MK_42_VERYFAR = REGISTRY.register("mk_42_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_42_veryfar"))); + public static final RegistryObject MK_42_RELOAD = REGISTRY.register("mk_42_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "mk_42_reload"))); + public static final RegistryObject CANNON_ZOOM_IN = REGISTRY.register("cannon_zoom_in", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "cannon_zoom_in"))); + public static final RegistryObject CANNON_ZOOM_OUT = REGISTRY.register("cannon_zoom_out", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "cannon_zoom_out"))); - public static final RegistryObject BULLET_SUPPLY = REGISTRY.register("bullet_supply", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bullet_supply"))); - public static final RegistryObject ADJUST_FOV = REGISTRY.register("adjust_fov", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "adjust_fov"))); - public static final RegistryObject DRONE_SOUND = REGISTRY.register("drone_sound", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "drone_sound"))); + public static final RegistryObject BULLET_SUPPLY = REGISTRY.register("bullet_supply", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "bullet_supply"))); + public static final RegistryObject ADJUST_FOV = REGISTRY.register("adjust_fov", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "adjust_fov"))); + public static final RegistryObject DRONE_SOUND = REGISTRY.register("drone_sound", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("superbwarfare", "drone_sound"))); } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModTabs.java b/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java similarity index 83% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModTabs.java rename to src/main/java/net/mcreator/superbwarfare/init/ModTabs.java index 372d264af..7a740e28c 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModTabs.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTabs.java @@ -14,13 +14,13 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class TargetModTabs { +public class ModTabs { public static final DeferredRegister TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ModUtils.MODID); - public static final RegistryObject GUN_TAB = TABS.register("target_guns", + public static final RegistryObject GUN_TAB = TABS.register("guns", () -> CreativeModeTab.builder() - .title(Component.translatable("item_group.superbwarfare.target_guns")) - .icon(() -> new ItemStack(TargetModItems.TASER.get())) + .title(Component.translatable("item_group.superbwarfare.guns")) + .icon(() -> new ItemStack(ModItems.TASER.get())) .displayItems( (param, output) -> { output.accept(Taser.getGunInstance()); @@ -54,23 +54,23 @@ public class TargetModTabs { public static final RegistryObject AMMO_TAB = TABS.register("ammo", () -> CreativeModeTab.builder() .title(Component.translatable("item_group.superbwarfare.ammo")) - .icon(() -> new ItemStack(TargetModItems.SHOTGUN_AMMO_BOX.get())) + .icon(() -> new ItemStack(ModItems.SHOTGUN_AMMO_BOX.get())) .withTabsBefore(GUN_TAB.getKey()) - .displayItems((param, output) -> TargetModItems.AMMO.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) + .displayItems((param, output) -> ModItems.AMMO.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) .build()); - public static final RegistryObject ITEM_TAB = TABS.register("target_item", + public static final RegistryObject ITEM_TAB = TABS.register("item", () -> CreativeModeTab.builder() - .title(Component.translatable("item_group.superbwarfare.target_item")) - .icon(() -> new ItemStack(TargetModItems.TARGET_DEPLOYER.get())) + .title(Component.translatable("item_group.superbwarfare.item")) + .icon(() -> new ItemStack(ModItems.TARGET_DEPLOYER.get())) .withTabsBefore(AMMO_TAB.getKey()) - .displayItems((param, output) -> TargetModItems.ITEMS.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) + .displayItems((param, output) -> ModItems.ITEMS.getEntries().forEach(registryObject -> output.accept(registryObject.get()))) .build()); @SubscribeEvent public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { - tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); + tabData.accept(ModItems.SENPAI_SPAWN_EGG.get()); } } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModTags.java b/src/main/java/net/mcreator/superbwarfare/init/ModTags.java similarity index 97% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModTags.java rename to src/main/java/net/mcreator/superbwarfare/init/ModTags.java index e23ed5a69..6b34790c4 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModTags.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTags.java @@ -7,7 +7,7 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -public class TargetModTags { +public class ModTags { public static class Items { public static final TagKey GUN = tag("gun"); diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModTrades.java b/src/main/java/net/mcreator/superbwarfare/init/ModTrades.java similarity index 57% rename from src/main/java/net/mcreator/superbwarfare/init/TargetModTrades.java rename to src/main/java/net/mcreator/superbwarfare/init/ModTrades.java index dd1389db1..f56aca3bb 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModTrades.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTrades.java @@ -9,81 +9,81 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE) -public class TargetModTrades { +public class ModTrades { @SubscribeEvent public static void registerTrades(VillagerTradesEvent event) { if (event.getType() == VillagerProfession.WEAPONSMITH) { - event.getTrades().get(1).add(new BasicItemListing(new ItemStack(TargetModItems.TASER_BLUEPRINT.get()), + event.getTrades().get(1).add(new BasicItemListing(new ItemStack(ModItems.TASER_BLUEPRINT.get()), new ItemStack(Items.EMERALD), 16, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 10), - new ItemStack(TargetModItems.STEEL_ACTION.get()), 12, 5, 0.05f)); + new ItemStack(ModItems.STEEL_ACTION.get()), 12, 5, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ModItems.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ModItems.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ModItems.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ModItems.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD), - new ItemStack(TargetModItems.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ModItems.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(TargetModItems.STEEL_BARREL.get()), 12, 5, 0.05f)); + new ItemStack(ModItems.STEEL_BARREL.get()), 12, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 6), - new ItemStack(TargetModItems.STEEL_TRIGGER.get()), 12, 5, 0.05f)); + new ItemStack(ModItems.STEEL_TRIGGER.get()), 12, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(TargetModItems.STEEL_SPRING.get()), 12, 5, 0.05f)); + new ItemStack(ModItems.STEEL_SPRING.get()), 12, 5, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(TargetModItems.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); + new ItemStack(ModItems.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), - new ItemStack(TargetModItems.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); + new ItemStack(ModItems.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(TargetModItems.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); + new ItemStack(ModItems.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), - new ItemStack(TargetModItems.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); + new ItemStack(ModItems.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); } } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/TargetModEntityRenderers.java b/src/main/java/net/mcreator/superbwarfare/init/TargetModEntityRenderers.java deleted file mode 100644 index 7bb88b88c..000000000 --- a/src/main/java/net/mcreator/superbwarfare/init/TargetModEntityRenderers.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.mcreator.superbwarfare.init; - -import net.mcreator.superbwarfare.client.renderer.entity.*; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public class TargetModEntityRenderers { - @SubscribeEvent - public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerEntityRenderer(TargetModEntities.TARGET_1.get(), Target1Renderer::new); - event.registerEntityRenderer(TargetModEntities.MORTAR.get(), MortarRenderer::new); - event.registerEntityRenderer(TargetModEntities.SENPAI.get(), SenpaiRenderer::new); - event.registerEntityRenderer(TargetModEntities.CLAYMORE.get(), ClaymoreRenderer::new); - event.registerEntityRenderer(TargetModEntities.TASER_BULLET_PROJECTILE.get(), TaserBulletProjectileRenderer::new); - event.registerEntityRenderer(TargetModEntities.GUN_GRENADE.get(), GunGrenadeRenderer::new); - event.registerEntityRenderer(TargetModEntities.TARGET.get(), TargetRenderer::new); - event.registerEntityRenderer(TargetModEntities.RPG_ROCKET.get(), RpgRocketRenderer::new); - event.registerEntityRenderer(TargetModEntities.MORTAR_SHELL.get(), MortarShellRenderer::new); - event.registerEntityRenderer(TargetModEntities.CANNON_SHELL.get(), CannonShellRenderer::new); - event.registerEntityRenderer(TargetModEntities.BOCEK_ARROW.get(), BocekArrowRenderer::new); - event.registerEntityRenderer(TargetModEntities.PROJECTILE.get(), ProjectileRenderer::new); - event.registerEntityRenderer(TargetModEntities.FRAG.get(), FragRenderer::new); - event.registerEntityRenderer(TargetModEntities.MK_42.get(), Mk42Renderer::new); - event.registerEntityRenderer(TargetModEntities.DRONE.get(), DroneRenderer::new); - event.registerEntityRenderer(TargetModEntities.DRONE_GRENADE.get(), DroneGrenadeRenderer::new); - } -} diff --git a/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java b/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java index fca857d52..54dcdb12b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java +++ b/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.item; import net.mcreator.superbwarfare.entity.ClaymoreEntity; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -32,7 +32,7 @@ public class ClaymoreMine extends Item { ItemStack stack = player.getItemInHand(hand); if (world instanceof ServerLevel serverLevel) { - TamableAnimal entityToSpawn = new ClaymoreEntity(TargetModEntities.CLAYMORE.get(), serverLevel); + TamableAnimal entityToSpawn = new ClaymoreEntity(ModEntities.CLAYMORE.get(), serverLevel); entityToSpawn.moveTo(player.getX(), player.getY() + 1.1, player.getZ(), player.getYRot(), player.getXRot()); entityToSpawn.setYBodyRot(player.getYRot()); entityToSpawn.setYHeadRot(player.getYRot()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/Drone.java b/src/main/java/net/mcreator/superbwarfare/item/Drone.java index 9141a8dc3..9ca529747 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/Drone.java +++ b/src/main/java/net/mcreator/superbwarfare/item/Drone.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.item; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -23,7 +23,7 @@ public class Drone extends Item { InteractionResultHolder ar = super.use(world, player, hand); if (world instanceof ServerLevel level) { - Entity entityToSpawn = TargetModEntities.DRONE.get().spawn(level, BlockPos.containing(player.getX() + 1.5 * player.getLookAngle().x, player.getY(), player.getZ() + 1.5 * player.getLookAngle().z), MobSpawnType.MOB_SUMMONED); + Entity entityToSpawn = ModEntities.DRONE.get().spawn(level, BlockPos.containing(player.getX() + 1.5 * player.getLookAngle().x, player.getY(), player.getZ() + 1.5 * player.getLookAngle().z), MobSpawnType.MOB_SUMMONED); if (entityToSpawn != null) { entityToSpawn.setYRot(player.getYRot()); entityToSpawn.setYBodyRot(player.getYRot()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/MortarDeployer.java b/src/main/java/net/mcreator/superbwarfare/item/MortarDeployer.java index 2410fc63f..f0a560921 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/MortarDeployer.java +++ b/src/main/java/net/mcreator/superbwarfare/item/MortarDeployer.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.item; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -23,7 +23,7 @@ public class MortarDeployer extends Item { InteractionResultHolder ar = super.use(world, player, hand); if (world instanceof ServerLevel level) { - Entity entityToSpawn = TargetModEntities.MORTAR.get().spawn(level, BlockPos.containing(player.getX() + 1.5 * player.getLookAngle().x, player.getY(), player.getZ() + 1.5 * player.getLookAngle().z), MobSpawnType.MOB_SUMMONED); + Entity entityToSpawn = ModEntities.MORTAR.get().spawn(level, BlockPos.containing(player.getX() + 1.5 * player.getLookAngle().x, player.getY(), player.getZ() + 1.5 * player.getLookAngle().z), MobSpawnType.MOB_SUMMONED); if (entityToSpawn != null) { entityToSpawn.setYRot(player.getYRot()); entityToSpawn.setYBodyRot(player.getYRot()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/TargetDeployer.java b/src/main/java/net/mcreator/superbwarfare/item/TargetDeployer.java index cef1be80d..dd9e4456f 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/TargetDeployer.java +++ b/src/main/java/net/mcreator/superbwarfare/item/TargetDeployer.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.item; -import net.mcreator.superbwarfare.init.TargetModEntities; +import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -24,7 +24,7 @@ public class TargetDeployer extends Item { if (player == null) return InteractionResult.FAIL; if (context.getLevel() instanceof ServerLevel level) { - Entity entityToSpawn = TargetModEntities.TARGET_1.get().spawn(level, BlockPos.containing(clickedPos.getX() + 0.5, clickedPos.getY() + 1, clickedPos.getZ() + 0.5), MobSpawnType.MOB_SUMMONED); + Entity entityToSpawn = ModEntities.TARGET_1.get().spawn(level, BlockPos.containing(clickedPos.getX() + 0.5, clickedPos.getY() + 1, clickedPos.getZ() + 0.5), MobSpawnType.MOB_SUMMONED); if (entityToSpawn != null) { entityToSpawn.setDeltaMovement(0, 0, 0); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/AmmoSupplierItem.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/AmmoSupplierItem.java index d9cef6fbd..9994bbdd6 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/AmmoSupplierItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/AmmoSupplierItem.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.tools.GunInfo; import net.minecraft.network.chat.Component; @@ -48,7 +48,7 @@ public abstract class AmmoSupplierItem extends Item { if (!level.isClientSide()) { player.displayClientMessage(Component.translatable("item.superbwarfare.ammo_supplier.supply", Component.translatable(this.type.translatableKey).getString(), ammoToAdd * count), false); - level.playSound(null, player.blockPosition(), TargetModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 1, 1); + level.playSound(null, player.blockPosition(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 1, 1); } return InteractionResultHolder.consume(stack); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java index 64d27a468..46cf6c8ca 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -57,7 +57,7 @@ public class CreativeAmmoBox extends Item { if (!level.isClientSide()) { player.displayClientMessage(Component.translatable("item.superbwarfare.ammo_supplier.creative"), false); - level.playSound(null, player.blockPosition(), TargetModSounds.BULLET_SUPPLY.get(), SoundSource.VOICE, 1, 1); + level.playSound(null, player.blockPosition(), ModSounds.BULLET_SUPPLY.get(), SoundSource.VOICE, 1, 1); } return InteractionResultHolder.consume(stack); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java index a14548e4c..f894a5484 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.AK47ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -46,7 +46,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.AK_47_RELOAD_EMPTY.get(), TargetModSounds.AK_47_RELOAD_NORMAL.get()); + return Set.of(ModSounds.AK_47_RELOAD_EMPTY.get(), ModSounds.AK_47_RELOAD_NORMAL.get()); } public AK47Item() { @@ -79,7 +79,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -162,8 +162,8 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.AK_47.get()); - GunsTool.initCreativeGun(stack, TargetModItems.AK_47.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.AK_47.get()); + GunsTool.initCreativeGun(stack, ModItems.AK_47.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java index 2b12c3145..d1e43b68d 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Aa12ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -78,7 +78,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -162,12 +162,12 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.AA_12_RELOAD_EMPTY.get(), TargetModSounds.AA_12_RELOAD_NORMAL.get()); + return Set.of(ModSounds.AA_12_RELOAD_EMPTY.get(), ModSounds.AA_12_RELOAD_NORMAL.get()); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.AA_12.get()); - GunsTool.initCreativeGun(stack, TargetModItems.AA_12.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.AA_12.get()); + GunsTool.initCreativeGun(stack, ModItems.AA_12.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java index 1228e986d..6f9d95dde 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.AbekiriItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -47,7 +47,7 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.ABEKIRI_RELOAD_EMPTY.get(), TargetModSounds.ABEKIRI_RELOAD_NORMAL.get()); + return Set.of(ModSounds.ABEKIRI_RELOAD_EMPTY.get(), ModSounds.ABEKIRI_RELOAD_NORMAL.get()); } public Abekiri() { @@ -80,7 +80,7 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -153,8 +153,8 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.ABEKIRI.get()); - GunsTool.initCreativeGun(stack, TargetModItems.ABEKIRI.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.ABEKIRI.get()); + GunsTool.initCreativeGun(stack, ModItems.ABEKIRI.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java index dc234a4f3..3faea0eae 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.BocekItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.RarityTool; @@ -76,7 +76,7 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.draw")); @@ -168,8 +168,8 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.BOCEK.get()); - GunsTool.initCreativeGun(stack, TargetModItems.BOCEK.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.BOCEK.get()); + GunsTool.initCreativeGun(stack, ModItems.BOCEK.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java index f91047613..f513592b8 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.DevotionItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -75,7 +75,7 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -149,12 +149,12 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.DEVOTION_RELOAD_EMPTY.get(), TargetModSounds.DEVOTION_RELOAD_NORMAL.get()); + return Set.of(ModSounds.DEVOTION_RELOAD_EMPTY.get(), ModSounds.DEVOTION_RELOAD_NORMAL.get()); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.DEVOTION.get()); - GunsTool.initCreativeGun(stack, TargetModItems.DEVOTION.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.DEVOTION.get()); + GunsTool.initCreativeGun(stack, ModItems.DEVOTION.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java index 1e73cd51c..97fc946dc 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.item.gun; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.tools.EnchantmentCategoryTool; import net.mcreator.superbwarfare.tools.GunsTool; @@ -43,7 +43,7 @@ public abstract class GunItem extends Item { public void inventoryTick(ItemStack itemstack, Level level, Entity entity, int slot, boolean selected) { if (entity instanceof LivingEntity living) { ItemStack mainHandItem = living.getMainHandItem(); - if (!itemstack.is(TargetModTags.Items.GUN)) { + if (!itemstack.is(ModTags.Items.GUN)) { return; } @@ -62,13 +62,13 @@ public abstract class GunItem extends Item { capability.syncPlayerVariables(entity); }); - if (itemstack.getItem() == TargetModItems.RPG.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { + if (itemstack.getItem() == ModItems.RPG.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { itemstack.getOrCreateTag().putDouble("empty", 1); } - if (itemstack.getItem() == TargetModItems.SKS.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { + if (itemstack.getItem() == ModItems.SKS.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { itemstack.getOrCreateTag().putBoolean("HoldOpen", true); } - if (itemstack.getItem() == TargetModItems.M_60.get() && itemstack.getOrCreateTag().getInt("ammo") <= 5) { + if (itemstack.getItem() == ModItems.M_60.get() && itemstack.getOrCreateTag().getInt("ammo") <= 5) { itemstack.getOrCreateTag().putBoolean("bullet_chain", true); } } @@ -121,7 +121,7 @@ public abstract class GunItem extends Item { @SubscribeEvent public static void onPickup(EntityItemPickupEvent event) { - if (event.getItem().getItem().is(TargetModTags.Items.GUN)) { + if (event.getItem().getItem().is(ModTags.Items.GUN)) { event.getItem().getItem().getOrCreateTag().putBoolean("draw", true); } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java index ae15708f5..7185309bc 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Hk416ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -158,12 +158,12 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.HK_416_RELOAD_EMPTY.get(), TargetModSounds.HK_416_RELOAD_NORMAL.get()); + return Set.of(ModSounds.HK_416_RELOAD_EMPTY.get(), ModSounds.HK_416_RELOAD_NORMAL.get()); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.HK_416.get()); - GunsTool.initCreativeGun(stack, TargetModItems.HK_416.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.HK_416.get()); + GunsTool.initCreativeGun(stack, ModItems.HK_416.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java index 1b3901cc1..953d1fdc4 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.HuntingRifleItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -50,7 +50,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.HUNTING_RIFLE_RELOAD_EMPTY.get()); + return Set.of(ModSounds.HUNTING_RIFLE_RELOAD_EMPTY.get()); } @Override @@ -79,7 +79,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -148,8 +148,8 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.HUNTING_RIFLE.get()); - GunsTool.initCreativeGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.HUNTING_RIFLE.get()); + GunsTool.initCreativeGun(stack, ModItems.HUNTING_RIFLE.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java index 99dd6a2c7..b8182ef51 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M4ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -158,12 +158,12 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.M_4_RELOAD_EMPTY.get(), TargetModSounds.M_4_RELOAD_NORMAL.get()); + return Set.of(ModSounds.M_4_RELOAD_EMPTY.get(), ModSounds.M_4_RELOAD_NORMAL.get()); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M_4.get()); - GunsTool.initCreativeGun(stack, TargetModItems.M_4.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.M_4.get()); + GunsTool.initCreativeGun(stack, ModItems.M_4.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java index 04f859bd5..a49fa5378 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M60ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -150,7 +150,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.M_60_RELOAD_EMPTY.get(), TargetModSounds.M_60_RELOAD_NORMAL.get()); + return Set.of(ModSounds.M_60_RELOAD_EMPTY.get(), ModSounds.M_60_RELOAD_NORMAL.get()); } @Override @@ -166,8 +166,8 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M_60.get()); - GunsTool.initCreativeGun(stack, TargetModItems.M_60.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.M_60.get()); + GunsTool.initCreativeGun(stack, ModItems.M_60.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java index 93c0b5383..258cee7c9 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M79ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -49,7 +49,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.M_79_RELOAD_EMPTY.get()); + return Set.of(ModSounds.M_79_RELOAD_EMPTY.get()); } public M79Item() { @@ -82,7 +82,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -170,12 +170,12 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == TargetModItems.GRENADE_40MM.get(); + return stack.getItem() == ModItems.GRENADE_40MM.get(); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M_79.get()); - GunsTool.initCreativeGun(stack, TargetModItems.M_79.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.M_79.get()); + GunsTool.initCreativeGun(stack, ModItems.M_79.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java index b9962dedd..b4d636923 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M870ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -76,7 +76,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (transformType != null && transformType.firstPerson()) { if (this.animationProcedure.equals("empty")) { @@ -155,7 +155,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.M_870_PREPARE_LOAD.get(), TargetModSounds.M_870_LOOP.get()); + return Set.of(ModSounds.M_870_PREPARE_LOAD.get(), ModSounds.M_870_LOOP.get()); } @Override @@ -171,8 +171,8 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M_870.get()); - GunsTool.initCreativeGun(stack, TargetModItems.M_870.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.M_870.get()); + GunsTool.initCreativeGun(stack, ModItems.M_870.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java index 886bd5cff..5ed1185e5 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M98bItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -155,15 +155,15 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { return Set.of( - TargetModSounds.M_98B_RELOAD_EMPTY.get(), - TargetModSounds.M_98B_RELOAD_NORMAL.get(), - TargetModSounds.M_98B_BOLT.get() + ModSounds.M_98B_RELOAD_EMPTY.get(), + ModSounds.M_98B_RELOAD_NORMAL.get(), + ModSounds.M_98B_BOLT.get() ); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M_98B.get()); - GunsTool.initCreativeGun(stack, TargetModItems.M_98B.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.M_98B.get()); + GunsTool.initCreativeGun(stack, ModItems.M_98B.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java index a40b046fc..197202c08 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.MarlinItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -76,7 +76,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (transformType != null && transformType.firstPerson()) { if (this.animationProcedure.equals("empty")) { @@ -172,7 +172,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.MARLIN_LOOP.get(), TargetModSounds.MARLIN_PREPARE.get(), TargetModSounds.MARLIN_END.get()); + return Set.of(ModSounds.MARLIN_LOOP.get(), ModSounds.MARLIN_PREPARE.get(), ModSounds.MARLIN_END.get()); } @Override @@ -188,8 +188,8 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.MARLIN.get()); - GunsTool.initCreativeGun(stack, TargetModItems.MARLIN.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.MARLIN.get()); + GunsTool.initCreativeGun(stack, ModItems.MARLIN.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java index ba71f60a7..038bff6f0 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.MinigunItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.ItemNBTTool; @@ -112,7 +112,7 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -194,8 +194,8 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.MINIGUN.get()); - GunsTool.initCreativeGun(stack, TargetModItems.MINIGUN.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.MINIGUN.get()); + GunsTool.initCreativeGun(stack, ModItems.MINIGUN.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java index a06be5c0f..1e121599a 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Mk14ItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -146,7 +146,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.MK_14_RELOAD_EMPTY.get(), TargetModSounds.MK_14_RELOAD_NORMAL.get()); + return Set.of(ModSounds.MK_14_RELOAD_EMPTY.get(), ModSounds.MK_14_RELOAD_NORMAL.get()); } @Override @@ -162,8 +162,8 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.MK_14.get()); - GunsTool.initCreativeGun(stack, TargetModItems.MK_14.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.MK_14.get()); + GunsTool.initCreativeGun(stack, ModItems.MK_14.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java index d1a1b1b08..e64634868 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Ntw20Renderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.tools.GunsTool; @@ -57,9 +57,9 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { return Set.of( - TargetModSounds.NTW_20_RELOAD_EMPTY.get(), - TargetModSounds.NTW_20_RELOAD_NORMAL.get(), - TargetModSounds.NTW_20_BOLT.get() + ModSounds.NTW_20_RELOAD_EMPTY.get(), + ModSounds.NTW_20_RELOAD_NORMAL.get(), + ModSounds.NTW_20_BOLT.get() ); } @@ -89,7 +89,7 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -122,7 +122,7 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -173,8 +173,8 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.NTW_20.get()); - GunsTool.initCreativeGun(stack, TargetModItems.NTW_20.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.NTW_20.get()); + GunsTool.initCreativeGun(stack, ModItems.NTW_20.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java index 13989bebe..85ebe99de 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.RpgItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -77,7 +77,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { var tag = stack.getOrCreateTag(); @@ -160,7 +160,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.RPG_RELOAD_EMPTY.get()); + return Set.of(ModSounds.RPG_RELOAD_EMPTY.get()); } @Override @@ -175,12 +175,12 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == TargetModItems.ROCKET.get(); + return stack.getItem() == ModItems.ROCKET.get(); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.RPG.get()); - GunsTool.initCreativeGun(stack, TargetModItems.RPG.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.RPG.get()); + GunsTool.initCreativeGun(stack, ModItems.RPG.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java index 389772881..830454f74 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.RpkItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -158,12 +158,12 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.RPK_RELOAD_EMPTY.get(), TargetModSounds.RPK_RELOAD_NORMAL.get()); + return Set.of(ModSounds.RPK_RELOAD_EMPTY.get(), ModSounds.RPK_RELOAD_NORMAL.get()); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.RPK.get()); - GunsTool.initCreativeGun(stack, TargetModItems.RPK.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.RPK.get()); + GunsTool.initCreativeGun(stack, ModItems.RPK.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java index 6d5784d3f..c37e77227 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java @@ -5,9 +5,9 @@ import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SentinelItemRenderer; import net.mcreator.superbwarfare.energy.ItemEnergyProvider; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.tools.GunsTool; @@ -124,7 +124,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -161,7 +161,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -242,10 +242,10 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { return Set.of( - TargetModSounds.SENTINEL_RELOAD_EMPTY.get(), - TargetModSounds.SENTINEL_RELOAD_NORMAL.get(), - TargetModSounds.SENTINEL_CHARGE.get(), - TargetModSounds.SENTINEL_BOLT.get() + ModSounds.SENTINEL_RELOAD_EMPTY.get(), + ModSounds.SENTINEL_RELOAD_NORMAL.get(), + ModSounds.SENTINEL_CHARGE.get(), + ModSounds.SENTINEL_BOLT.get() ); } @@ -262,8 +262,8 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.SENTINEL.get()); - GunsTool.initCreativeGun(stack, TargetModItems.SENTINEL.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.SENTINEL.get()); + GunsTool.initCreativeGun(stack, ModItems.SENTINEL.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java index f389f3282..86f62cb4f 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SksItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -46,7 +46,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.SKS_RELOAD_EMPTY.get(), TargetModSounds.SKS_RELOAD_NORMAL.get()); + return Set.of(ModSounds.SKS_RELOAD_EMPTY.get(), ModSounds.SKS_RELOAD_NORMAL.get()); } public SksItem() { @@ -79,7 +79,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -154,8 +154,8 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.SKS.get()); - GunsTool.initCreativeGun(stack, TargetModItems.SKS.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.SKS.get()); + GunsTool.initCreativeGun(stack, ModItems.SKS.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java index 4b96b4ad3..e8dcd9bde 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SvdItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -74,7 +74,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { var tag = stack.getOrCreateTag(); @@ -139,7 +139,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.SVD_RELOAD_EMPTY.get(), TargetModSounds.SVD_RELOAD_NORMAL.get()); + return Set.of(ModSounds.SVD_RELOAD_EMPTY.get(), ModSounds.SVD_RELOAD_NORMAL.get()); } @Override @@ -155,8 +155,8 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.SVD.get()); - GunsTool.initCreativeGun(stack, TargetModItems.SVD.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.SVD.get()); + GunsTool.initCreativeGun(stack, ModItems.SVD.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java index 2287c20d1..8497c4762 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java @@ -4,10 +4,10 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.TaserItemRenderer; -import net.mcreator.superbwarfare.init.TargetModEnchantments; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModEnchantments; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.client.Minecraft; @@ -73,7 +73,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.TASER_RELOAD_EMPTY.get()); + return Set.of(ModSounds.TASER_RELOAD_EMPTY.get()); } @Override @@ -102,7 +102,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -188,7 +188,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { if (entity instanceof Player player) { stack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); } - int charge_speed = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.SUPER_RECHARGE.get(), stack); + int charge_speed = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.SUPER_RECHARGE.get(), stack); if (ItemNBTTool.getInt(stack, TAG_POWER, 1200) < 1200) { ItemNBTTool.setInt(stack, TAG_POWER, Mth.clamp(ItemNBTTool.getInt(stack, TAG_POWER, 1200) + 1 + charge_speed,0,1200)); @@ -196,12 +196,12 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == TargetModItems.TASER_ELECTRODE.get(); + return stack.getItem() == ModItems.TASER_ELECTRODE.get(); } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.TASER.get()); - GunsTool.initCreativeGun(stack, TargetModItems.TASER.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.TASER.get()); + GunsTool.initCreativeGun(stack, ModItems.TASER.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java index 0d00b9b2f..d10927476 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.TracheliumItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.*; import net.minecraft.ChatFormatting; @@ -56,7 +56,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.TRACHELIUM_RELOAD_EMPTY.get()); + return Set.of(ModSounds.TRACHELIUM_RELOAD_EMPTY.get()); } @Override @@ -85,7 +85,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { @@ -161,8 +161,8 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.TRACHELIUM.get()); - GunsTool.initCreativeGun(stack, TargetModItems.TRACHELIUM.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.TRACHELIUM.get()); + GunsTool.initCreativeGun(stack, ModItems.TRACHELIUM.getId().getPath()); return stack; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java index 49ad208f7..add6e0829 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java @@ -4,9 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.VectorItemRenderer; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -75,7 +75,7 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (this.animationProcedure.equals("empty")) { if (stack.getOrCreateTag().getInt("draw_time") < 11) { @@ -149,14 +149,14 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.VECTOR.get()); - GunsTool.initCreativeGun(stack, TargetModItems.VECTOR.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.VECTOR.get()); + GunsTool.initCreativeGun(stack, ModItems.VECTOR.getId().getPath()); return stack; } @Override public Set getReloadSound() { - return Set.of(TargetModSounds.VECTOR_RELOAD_NORMAL.get(), TargetModSounds.VECTOR_RELOAD_EMPTY.get()); + return Set.of(ModSounds.VECTOR_RELOAD_NORMAL.get(), ModSounds.VECTOR_RELOAD_EMPTY.get()); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/CameraMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/CameraMixin.java index 4f336ed35..79b516115 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/CameraMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/CameraMixin.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.mixins; import net.mcreator.superbwarfare.entity.DroneEntity; import net.mcreator.superbwarfare.entity.Mk42Entity; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.util.Mth; @@ -34,7 +34,7 @@ public abstract class CameraMixin { if (player != null) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { DroneEntity drone = player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) .stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst().orElse(null); diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/GameRendererMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/GameRendererMixin.java index 8991b6b2f..f56bf600a 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/GameRendererMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/GameRendererMixin.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.mixins; import com.mojang.blaze3d.vertex.PoseStack; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModTags; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.world.entity.player.Player; @@ -20,7 +20,7 @@ public class GameRendererMixin { Player player = mc.player; if (player != null) { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModTags.Items.GUN)) { + if (stack.is(ModTags.Items.GUN)) { ci.cancel(); } } diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/ItemInHandLayerMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/ItemInHandLayerMixin.java index 45ac5367c..76779e338 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/ItemInHandLayerMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/ItemInHandLayerMixin.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.mixins; import com.mojang.blaze3d.vertex.PoseStack; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModTags; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.layers.ItemInHandLayer; import net.minecraft.world.entity.EntityType; @@ -24,7 +24,7 @@ public class ItemInHandLayerMixin { if (entity.getType() == EntityType.PLAYER) { if (arm == HumanoidArm.LEFT) { ItemStack mainHand = entity.getMainHandItem(); - if (!mainHand.is(TargetModTags.Items.GUN)) return; + if (!mainHand.is(ModTags.Items.GUN)) return; ci.cancel(); } diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/KeyMappingMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/KeyMappingMixin.java index 751aeffe5..929529e35 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/KeyMappingMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/KeyMappingMixin.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.mixins; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.client.Minecraft; import net.minecraft.client.player.Input; import net.minecraft.client.player.KeyboardInput; @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.mcreator.superbwarfare.init.TargetModMobEffects; +import net.mcreator.superbwarfare.init.ModMobEffects; @Mixin(KeyboardInput.class) public abstract class KeyMappingMixin extends Input { @@ -25,7 +25,7 @@ public abstract class KeyMappingMixin extends Input { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { this.up = false; this.down = false; this.left = false; @@ -37,7 +37,7 @@ public abstract class KeyMappingMixin extends Input { } if (Minecraft.getInstance().player == null - || !Minecraft.getInstance().player.hasEffect(TargetModMobEffects.SHOCK.get()) + || !Minecraft.getInstance().player.hasEffect(ModMobEffects.SHOCK.get()) || Minecraft.getInstance().player.isSpectator()) { return; } diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/LivingEntityMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/LivingEntityMixin.java index eabda9823..1ac091380 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/LivingEntityMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/LivingEntityMixin.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.mixins; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; +import net.mcreator.superbwarfare.init.ModDamageTypes; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; @@ -22,9 +22,9 @@ public class LivingEntityMixin { @ModifyArg(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;knockback(DDD)V"), index = 0) private double modifyApplyKnockbackArgs(double original) { - if (this.target$source.is(TargetModDamageTypes.GUN_FIRE) || this.target$source.is(TargetModDamageTypes.GUN_FIRE_HEADSHOT) - || this.target$source.is(TargetModDamageTypes.ARROW_IN_KNEE) || this.target$source.is(TargetModDamageTypes.ARROW_IN_BRAIN) - || this.target$source.is(TargetModDamageTypes.SHOCK)) { + if (this.target$source.is(ModDamageTypes.GUN_FIRE) || this.target$source.is(ModDamageTypes.GUN_FIRE_HEADSHOT) + || this.target$source.is(ModDamageTypes.ARROW_IN_KNEE) || this.target$source.is(ModDamageTypes.ARROW_IN_BRAIN) + || this.target$source.is(ModDamageTypes.SHOCK)) { return 0.1 * original; } return original; diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java index 326013ea9..f499bff6e 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.mixins; import net.mcreator.superbwarfare.entity.Mk42Entity; -import net.mcreator.superbwarfare.init.TargetModMobEffects; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModMobEffects; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; @@ -31,7 +31,7 @@ public class MouseHandlerMixin { return original; } - if (player.hasEffect(TargetModMobEffects.SHOCK.get()) && !player.isSpectator()) { + if (player.hasEffect(ModMobEffects.SHOCK.get()) && !player.isSpectator()) { return 0; } @@ -45,7 +45,7 @@ public class MouseHandlerMixin { } } - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return original; } diff --git a/src/main/java/net/mcreator/superbwarfare/mobeffect/ShockMobEffect.java b/src/main/java/net/mcreator/superbwarfare/mobeffect/ShockMobEffect.java index 9f3312758..444ca2a41 100644 --- a/src/main/java/net/mcreator/superbwarfare/mobeffect/ShockMobEffect.java +++ b/src/main/java/net/mcreator/superbwarfare/mobeffect/ShockMobEffect.java @@ -1,9 +1,9 @@ package net.mcreator.superbwarfare.mobeffect; import net.mcreator.superbwarfare.ModUtils; -import net.mcreator.superbwarfare.init.TargetModDamageTypes; -import net.mcreator.superbwarfare.init.TargetModMobEffects; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModDamageTypes; +import net.mcreator.superbwarfare.init.ModMobEffects; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; @@ -42,11 +42,11 @@ public class ShockMobEffect extends MobEffect { attacker = entity.level().getEntity(entity.getPersistentData().getInt("TargetShockAttacker")); } - entity.hurt(TargetModDamageTypes.causeShockDamage(entity.level().registryAccess(), attacker), 2 + (1.25f * amplifier)); - entity.level().playSound(null, entity.getOnPos(), TargetModSounds.ELECTRIC.get(), SoundSource.PLAYERS, 1, 1); + entity.hurt(ModDamageTypes.causeShockDamage(entity.level().registryAccess(), attacker), 2 + (1.25f * amplifier)); + entity.level().playSound(null, entity.getOnPos(), ModSounds.ELECTRIC.get(), SoundSource.PLAYERS, 1, 1); if (attacker instanceof ServerPlayer player) { - player.level().playSound(null, player.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); + player.level().playSound(null, player.blockPosition(), ModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1); ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } } @@ -61,19 +61,19 @@ public class ShockMobEffect extends MobEffect { LivingEntity living = event.getEntity(); MobEffectInstance instance = event.getEffectInstance(); - if (!instance.getEffect().equals(TargetModMobEffects.SHOCK.get())) { + if (!instance.getEffect().equals(ModMobEffects.SHOCK.get())) { return; } if (living instanceof Player) { if (!living.level().isClientSide()) { - living.level().playSound(null, BlockPos.containing(living.getX(), living.getY(), living.getZ()), TargetModSounds.SHOCK.get(), SoundSource.HOSTILE, 1, 1); + living.level().playSound(null, BlockPos.containing(living.getX(), living.getY(), living.getZ()), ModSounds.SHOCK.get(), SoundSource.HOSTILE, 1, 1); } else { - living.level().playLocalSound(living.getX(), living.getY(), living.getZ(), TargetModSounds.SHOCK.get(), SoundSource.HOSTILE, 1, 1, false); + living.level().playLocalSound(living.getX(), living.getY(), living.getZ(), ModSounds.SHOCK.get(), SoundSource.HOSTILE, 1, 1, false); } } - living.hurt(TargetModDamageTypes.causeShockDamage(living.level().registryAccess(), + living.hurt(ModDamageTypes.causeShockDamage(living.level().registryAccess(), event.getEffectSource()), 2 + (1.25f * instance.getAmplifier())); if (event.getEffectSource() instanceof LivingEntity source) { @@ -90,7 +90,7 @@ public class ShockMobEffect extends MobEffect { return; } - if (instance.getEffect().equals(TargetModMobEffects.SHOCK.get())) { + if (instance.getEffect().equals(ModMobEffects.SHOCK.get())) { living.getPersistentData().remove("TargetShockAttacker"); } } @@ -104,7 +104,7 @@ public class ShockMobEffect extends MobEffect { return; } - if (instance.getEffect().equals(TargetModMobEffects.SHOCK.get())) { + if (instance.getEffect().equals(ModMobEffects.SHOCK.get())) { living.getPersistentData().remove("TargetShockAttacker"); } } @@ -113,7 +113,7 @@ public class ShockMobEffect extends MobEffect { public static void onLivingTick(LivingEvent.LivingTickEvent event) { LivingEntity living = event.getEntity(); - if (living.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (living.hasEffect(ModMobEffects.SHOCK.get())) { living.setXRot((float) Mth.nextDouble(RandomSource.create(), -23, -36)); living.xRotO = living.getXRot(); } @@ -133,7 +133,7 @@ public class ShockMobEffect extends MobEffect { if (sourceentity == null) { return; } - if (sourceentity instanceof LivingEntity living && living.hasEffect(TargetModMobEffects.SHOCK.get())) { + if (sourceentity instanceof LivingEntity living && living.hasEffect(ModMobEffects.SHOCK.get())) { event.setCanceled(true); } } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/AdjustMortarAngleMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/AdjustMortarAngleMessage.java index 3744d9592..85d282ab8 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/AdjustMortarAngleMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/AdjustMortarAngleMessage.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.network.message; import net.mcreator.superbwarfare.client.gui.RangeHelper; -import net.mcreator.superbwarfare.init.TargetModAttributes; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModAttributes; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.tools.SoundTool; import net.mcreator.superbwarfare.tools.TraceTool; import net.minecraft.network.FriendlyByteBuf; @@ -43,12 +43,12 @@ public class AdjustMortarAngleMessage { double angle = 0; if (looking instanceof LivingEntity living){ - living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue(Mth.clamp(living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 0.5 * message.scroll,20,89)); - angle = living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue(); + living.getAttribute(ModAttributes.MORTAR_PITCH.get()).setBaseValue(Mth.clamp(living.getAttribute(ModAttributes.MORTAR_PITCH.get()).getBaseValue() + 0.5 * message.scroll,20,89)); + angle = living.getAttribute(ModAttributes.MORTAR_PITCH.get()).getBaseValue(); } player.displayClientMessage(Component.literal("Angle:" + new java.text.DecimalFormat("##.##").format(angle) + " Range:" + new java.text.DecimalFormat("##.#").format((int) RangeHelper.getRange(angle)) + "M"), true); - SoundTool.playLocalSound(player, TargetModSounds.ADJUST_FOV.get(), 1f, 0.7f); + SoundTool.playLocalSound(player, ModSounds.ADJUST_FOV.get(), 1f, 0.7f); }); context.get().setPacketHandled(true); } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java index a8ecda538..eee472bc8 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.tools.SoundTool; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; @@ -34,7 +34,7 @@ public class AdjustZoomFovMessage { } ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } var tag = stack.getOrCreateTag(); @@ -43,7 +43,7 @@ public class AdjustZoomFovMessage { double max_zoom = tag.getDouble("max_zoom") - tag.getDouble("zoom"); tag.putDouble("custom_zoom", Mth.clamp(tag.getDouble("custom_zoom") + 0.5 * message.scroll, min_zoom, max_zoom)); if (tag.getDouble("custom_zoom") > min_zoom && tag.getDouble("custom_zoom") < max_zoom) { - SoundTool.playLocalSound(player, TargetModSounds.ADJUST_FOV.get(), 1f, 0.7f); + SoundTool.playLocalSound(player, ModSounds.ADJUST_FOV.get(), 1f, 0.7f); } }); context.get().setPacketHandled(true); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/DoubleJumpMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/DoubleJumpMessage.java index cee542370..a6dba091b 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/DoubleJumpMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/DoubleJumpMessage.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; @@ -51,9 +51,9 @@ public class DoubleJumpMessage { if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).playerDoubleJump) { entity.setDeltaMovement(new Vec3((1 * entity.getLookAngle().x), 0.8, (1 * entity.getLookAngle().z))); if (!level.isClientSide()) { - level.playSound(null, BlockPos.containing(x, y, z), TargetModSounds.DOUBLE_JUMP.get(), SoundSource.BLOCKS, 1, 1); + level.playSound(null, BlockPos.containing(x, y, z), ModSounds.DOUBLE_JUMP.get(), SoundSource.BLOCKS, 1, 1); } else { - level.playLocalSound(x, y, z, TargetModSounds.DOUBLE_JUMP.get(), SoundSource.BLOCKS, 1, 1, false); + level.playLocalSound(x, y, z, ModSounds.DOUBLE_JUMP.get(), SoundSource.BLOCKS, 1, 1, false); } entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.playerDoubleJump = false; diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/DroneFireMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/DroneFireMessage.java index dfd980dfb..69e5729ce 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/DroneFireMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/DroneFireMessage.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.network.message; import net.mcreator.superbwarfare.entity.DroneEntity; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -31,7 +31,7 @@ public class DroneFireMessage { Player player = context.getSender(); ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { DroneEntity drone = player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) .stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst().orElse(null); if (drone != null) { diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/DroneMovementMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/DroneMovementMessage.java index be80601a5..5c39c20e2 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/DroneMovementMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/DroneMovementMessage.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.network.message; import net.mcreator.superbwarfare.entity.DroneEntity; -import net.mcreator.superbwarfare.init.TargetModItems; +import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -35,7 +35,7 @@ public class DroneMovementMessage { ItemStack stack = player.getMainHandItem(); - if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) .stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst() .ifPresent(drone -> { diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java index cd0e5ade8..53194713c 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java @@ -65,7 +65,7 @@ public class FireMessage { capability.syncPlayerVariables(player); }); - if (player.getMainHandItem().getItem() == TargetModItems.BOCEK.get()) { + if (player.getMainHandItem().getItem() == ModItems.BOCEK.get()) { handleBowShoot(player); } } @@ -74,22 +74,22 @@ public class FireMessage { private static void handlePlayerShoot(Player player) { var handItem = player.getMainHandItem(); - if (!handItem.is(TargetModTags.Items.GUN)) { + if (!handItem.is(ModTags.Items.GUN)) { return; } var tag = handItem.getOrCreateTag(); - if (handItem.getItem() == TargetModItems.TASER.get()) { + if (handItem.getItem() == ModItems.TASER.get()) { handleTaserFire(player); } - if (handItem.getItem() == TargetModItems.M_79.get()) { + if (handItem.getItem() == ModItems.M_79.get()) { handleM79Fire(player); } - if (handItem.getItem() == TargetModItems.RPG.get()) { + if (handItem.getItem() == ModItems.RPG.get()) { handleRpgFire(player); } @@ -103,19 +103,19 @@ public class FireMessage { tag.putDouble("force_stop", 1); } - if (handItem.getItem() != TargetModItems.BOCEK.get() - && handItem.getItem() != TargetModItems.MINIGUN.get() + if (handItem.getItem() != ModItems.BOCEK.get() + && handItem.getItem() != ModItems.MINIGUN.get() && tag.getInt("ammo") == 0 && !tag.getBoolean("reloading")) { if (!player.level().isClientSide()) { - SoundTool.playLocalSound(player, TargetModSounds.TRIGGER_CLICK.get(), 10, 1); + SoundTool.playLocalSound(player, ModSounds.TRIGGER_CLICK.get(), 10, 1); } } - if (handItem.getItem() == TargetModItems.MINIGUN.get()) { + if (handItem.getItem() == ModItems.MINIGUN.get()) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo == 0) { if (!player.level().isClientSide()) { - SoundTool.playLocalSound(player, TargetModSounds.TRIGGER_CLICK.get(), 10, 1); + SoundTool.playLocalSound(player, ModSounds.TRIGGER_CLICK.get(), 10, 1); } } } @@ -140,8 +140,8 @@ public class FireMessage { double power = stack.getOrCreateTag().getDouble("power"); if (player instanceof ServerPlayer serverPlayer) { - SoundTool.stopSound(serverPlayer, TargetModSounds.BOCEK_PULL_1P.getId(), SoundSource.PLAYERS); - SoundTool.stopSound(serverPlayer, TargetModSounds.BOCEK_PULL_3P.getId(), SoundSource.PLAYERS); + SoundTool.stopSound(serverPlayer, ModSounds.BOCEK_PULL_1P.getId(), SoundSource.PLAYERS); + SoundTool.stopSound(serverPlayer, ModSounds.BOCEK_PULL_3P.getId(), SoundSource.PLAYERS); } if (stack.getOrCreateTag().getDouble("power") >= 6) { @@ -149,7 +149,7 @@ public class FireMessage { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { Level level = player.level(); if (!level.isClientSide()) { - int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), stack); + int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.MONSTER_HUNTER.get(), stack); float damage = (float) (0.02 * stack.getOrCreateTag().getDouble("damage") * (1 + 0.05 * stack.getOrCreateTag().getInt("level"))); BocekArrowEntity arrow = new BocekArrowEntity(player, level, monsterMultiple); @@ -165,8 +165,8 @@ public class FireMessage { } if (!player.level().isClientSide()) { - SoundTool.playLocalSound(player, TargetModSounds.BOCEK_ZOOM_FIRE_1P.get(), 10, 1); - player.playSound(TargetModSounds.BOCEK_ZOOM_FIRE_3P.get(), 2, 1); + SoundTool.playLocalSound(player, ModSounds.BOCEK_ZOOM_FIRE_1P.get(), 10, 1); + player.playSound(ModSounds.BOCEK_ZOOM_FIRE_3P.get(), 2, 1); } } else { stack.getOrCreateTag().putBoolean("shoot", true); @@ -176,8 +176,8 @@ public class FireMessage { } if (!player.level().isClientSide() && player.getServer() != null) { - SoundTool.playLocalSound(player, TargetModSounds.BOCEK_SHATTER_CAP_FIRE_1P.get(), 10, 1); - player.playSound(TargetModSounds.BOCEK_SHATTER_CAP_FIRE_3P.get(), 2, 1); + SoundTool.playLocalSound(player, ModSounds.BOCEK_SHATTER_CAP_FIRE_1P.get(), 10, 1); + player.playSound(ModSounds.BOCEK_SHATTER_CAP_FIRE_3P.get(), 2, 1); } } @@ -207,7 +207,7 @@ public class FireMessage { double damage; float headshot = (float) tag.getDouble("headshot"); float velocity = 4 * (float) tag.getDouble("speed"); - int monster_multiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), heldItem); + int monster_multiple = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.MONSTER_HUNTER.get(), heldItem); var projectile = new ProjectileEntity(player.level()) .shooter(player) @@ -237,12 +237,12 @@ public class FireMessage { player.getCooldowns().addCooldown(stack.getItem(), 5); if (player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.TASER_FIRE_1P.get(), 1, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.TASER_FIRE_3P.get(), SoundSource.PLAYERS, 1, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.TASER_FIRE_1P.get(), 1, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.TASER_FIRE_3P.get(), SoundSource.PLAYERS, 1, 1); } - int volt = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.VOLT_OVERLOAD.get(), stack); - int wire_length = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.LONGER_WIRE.get(), stack); + int volt = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.VOLT_OVERLOAD.get(), stack); + int wire_length = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.LONGER_WIRE.get(), stack); Level level = player.level(); if (!level.isClientSide()) { @@ -272,7 +272,7 @@ public class FireMessage { Level level = player.level(); if (!level.isClientSide()) { - int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), stack); + int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.MONSTER_HUNTER.get(), stack); GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage") * (float) stack.getOrCreateTag().getDouble("damageadd"), monsterMultiple); gunGrenadeEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); @@ -292,10 +292,10 @@ public class FireMessage { player.getCooldowns().addCooldown(stack.getItem(), 2); if (player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_79_FIRE_1P.get(), 2, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.M_79_FIRE_3P.get(), SoundSource.PLAYERS, 4, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.M_79_FAR.get(), SoundSource.PLAYERS, 6, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.M_79_VERYFAR.get(), SoundSource.PLAYERS, 12, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.M_79_FIRE_1P.get(), 2, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.M_79_FIRE_3P.get(), SoundSource.PLAYERS, 4, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.M_79_FAR.get(), SoundSource.PLAYERS, 6, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.M_79_VERYFAR.get(), SoundSource.PLAYERS, 12, 1); } stack.getOrCreateTag().putBoolean("shoot", true); @@ -316,7 +316,7 @@ public class FireMessage { if (!tag.getBoolean("reloading") && !player.getCooldowns().isOnCooldown(mainHandItem.getItem()) && tag.getInt("ammo") > 0) { if (!level.isClientSide()) { - int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), mainHandItem); + int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.MONSTER_HUNTER.get(), mainHandItem); RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, (float) tag.getDouble("damage") * (float) tag.getDouble("damageadd"), monsterMultiple); rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) tag.getDouble("velocity"), @@ -341,10 +341,10 @@ public class FireMessage { player.getCooldowns().addCooldown(mainHandItem.getItem(), 10); if (player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPG_FIRE_1P.get(), 2, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.RPG_FIRE_3P.get(), SoundSource.PLAYERS, 4, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.RPG_FAR.get(), SoundSource.PLAYERS, 8, 1); - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.RPG_VERYFAR.get(), SoundSource.PLAYERS, 16, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.RPG_FIRE_1P.get(), 2, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.RPG_FIRE_3P.get(), SoundSource.PLAYERS, 4, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.RPG_FAR.get(), SoundSource.PLAYERS, 8, 1); + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.RPG_VERYFAR.get(), SoundSource.PLAYERS, 16, 1); } tag.putBoolean("shoot", true); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java index 31353642d..d9f1d82c1 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.core.Holder; import net.minecraft.nbt.CompoundTag; @@ -49,7 +49,7 @@ public class FireModeMessage { private static void setFireMode(Player player, CompoundTag tag) { if (player instanceof ServerPlayer serverPlayer) { - serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(TargetModSounds.FIRE_RATE.get()), + serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ModSounds.FIRE_RATE.get()), SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 1f, 1f, serverPlayer.level().random.nextLong())); } tag.putDouble("cg", 10); @@ -60,7 +60,7 @@ public class FireModeMessage { CompoundTag tag = mainHandItem.getOrCreateTag(); int fireMode = tag.getInt("fire_mode"); - if (mainHandItem.is(TargetModTags.Items.GUN)) { + if (mainHandItem.is(ModTags.Items.GUN)) { if (fireMode == 0) { if (tag.getDouble("burst") == 1) { tag.putInt("fire_mode", 1); @@ -99,7 +99,7 @@ public class FireModeMessage { var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()); - if (mainHandItem.getItem() == TargetModItems.SENTINEL.get() + if (mainHandItem.getItem() == ModItems.SENTINEL.get() && !player.isSpectator() && !capability.zooming && !(player.getCooldowns().isOnCooldown(mainHandItem.getItem())) @@ -108,7 +108,7 @@ public class FireModeMessage { int count = 0; for (var inv : player.getInventory().items) { - if (inv.is(TargetModItems.SHIELD_CELL.get())) { + if (inv.is(ModItems.SHIELD_CELL.get())) { count++; } } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/GunRecycleGuiButtonMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/GunRecycleGuiButtonMessage.java index 5583f4ef2..447a46ec8 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/GunRecycleGuiButtonMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/GunRecycleGuiButtonMessage.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.world.inventory.GunRecycleGuiMenu; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; @@ -64,22 +64,22 @@ public class GunRecycleGuiButtonMessage { var slot0 = menu.get(0); var gun = slot0.getItem(); - if (gun.is(TargetModTags.Items.GUN)) { + if (gun.is(ModTags.Items.GUN)) { // 普通稀有度 var material = switch (gun.getRarity()) { - case COMMON -> TargetModItems.COMMON_MATERIAL_PACK.get(); - case RARE -> TargetModItems.RARE_MATERIAL_PACK.get(); - case EPIC -> TargetModItems.EPIC_MATERIAL_PACK.get(); + case COMMON -> ModItems.COMMON_MATERIAL_PACK.get(); + case RARE -> ModItems.RARE_MATERIAL_PACK.get(); + case EPIC -> ModItems.EPIC_MATERIAL_PACK.get(); default -> null; }; if (material != null) ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(material)); // 特殊稀有度 - if (gun.is(TargetModTags.Items.LEGENDARY_GUN)) { - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(TargetModItems.LEGENDARY_MATERIAL_PACK.get())); + if (gun.is(ModTags.Items.LEGENDARY_GUN)) { + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.LEGENDARY_MATERIAL_PACK.get())); } - if (gun.is(TargetModTags.Items.SPECIAL_GUN)) { - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(TargetModItems.SPECIAL_MATERIAL_PACK.get())); + if (gun.is(ModTags.Items.SPECIAL_GUN)) { + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.SPECIAL_MATERIAL_PACK.get())); } // 高等级额外奖励 @@ -92,7 +92,7 @@ public class GunRecycleGuiButtonMessage { if (Math.random() < 0.03 * level) soulSteelNuggetCount++; if (Math.random() < 0.06 * level) soulSteelNuggetCount++; - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(TargetModItems.SOUL_STEEL_NUGGET.get(), soulSteelNuggetCount)); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.SOUL_STEEL_NUGGET.get(), soulSteelNuggetCount)); } slot0.set(ItemStack.EMPTY); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/InteractMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/InteractMessage.java index e96621726..fd1331389 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/InteractMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/InteractMessage.java @@ -1,8 +1,8 @@ package net.mcreator.superbwarfare.network.message; import net.mcreator.superbwarfare.entity.DroneEntity; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.tools.TraceTool; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -51,7 +51,7 @@ public class InteractMessage { return; if (type == 0) { ItemStack stack = player.getMainHandItem(); - if (player.getMainHandItem().is(TargetModTags.Items.GUN)) { + if (player.getMainHandItem().is(ModTags.Items.GUN)) { double block_range = player.getBlockReach(); double entity_range = player.getBlockReach(); @@ -64,7 +64,7 @@ public class InteractMessage { return; player.interactOn(lookingEntity, InteractionHand.MAIN_HAND); - } else if (stack.is(TargetModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked") && !player.getCooldowns().isOnCooldown(stack.getItem())) { + } else if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked") && !player.getCooldowns().isOnCooldown(stack.getItem())) { DroneEntity drone = player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) .stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst().orElse(null); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java index 714d2adfc..39e8ab600 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; @@ -47,7 +47,7 @@ public class ReloadMessage { var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()); if (!player.isSpectator() - && stack.is(TargetModTags.Items.GUN) + && stack.is(ModTags.Items.GUN) && !capability.zooming && !stack.getOrCreateTag().getBoolean("charging") && !(player.getCooldowns().isOnCooldown(stack.getItem())) @@ -60,24 +60,24 @@ public class ReloadMessage { boolean can_single_reload = tag.getDouble("iterative_time") != 0; //检查备弹 - if (stack.is(TargetModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) { + if (stack.is(ModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) { return; - } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) { + } else if (stack.is(ModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) { return; - } else if ((stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) && capability.handgunAmmo == 0) { + } else if ((stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) && capability.handgunAmmo == 0) { return; - } else if (stack.is(TargetModTags.Items.RIFLE) && capability.rifleAmmo == 0) { + } else if (stack.is(ModTags.Items.RIFLE) && capability.rifleAmmo == 0) { return; - } else if (stack.getItem() == TargetModItems.TASER.get() && tag.getInt("max_ammo") == 0) { + } else if (stack.getItem() == ModItems.TASER.get() && tag.getInt("max_ammo") == 0) { return; - } else if (stack.getItem() == TargetModItems.M_79.get() && tag.getInt("max_ammo") == 0) { + } else if (stack.getItem() == ModItems.M_79.get() && tag.getInt("max_ammo") == 0) { return; - } else if (stack.getItem() == TargetModItems.RPG.get() && tag.getInt("max_ammo") == 0) { + } else if (stack.getItem() == ModItems.RPG.get() && tag.getInt("max_ammo") == 0) { return; } if (can_reload) { - if (stack.is(TargetModTags.Items.OPEN_BOLT)) { - if (stack.getItem() == TargetModItems.M_60.get() || stack.getItem() == TargetModItems.ABEKIRI.get()) { + if (stack.is(ModTags.Items.OPEN_BOLT)) { + if (stack.getItem() == ModItems.M_60.get() || stack.getItem() == ModItems.ABEKIRI.get()) { if (tag.getInt("ammo") < tag.getDouble("mag")) { tag.putBoolean("start_reload", true); } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/SensitivityMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/SensitivityMessage.java index 0db7be307..6b514dab9 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/SensitivityMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/SensitivityMessage.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModTags; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; @@ -32,7 +32,7 @@ public class SensitivityMessage { } ItemStack stack = player.getMainHandItem(); - if (!stack.is(TargetModTags.Items.GUN)) { + if (!stack.is(ModTags.Items.GUN)) { return; } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/ZoomMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/ZoomMessage.java index f8f6be9b0..dde850293 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/ZoomMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/ZoomMessage.java @@ -1,9 +1,9 @@ package net.mcreator.superbwarfare.network.message; import net.mcreator.superbwarfare.entity.Mk42Entity; -import net.mcreator.superbwarfare.init.TargetModItems; -import net.mcreator.superbwarfare.init.TargetModSounds; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModSounds; +import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.network.TargetModVariables; import net.mcreator.superbwarfare.tools.SoundTool; import net.minecraft.network.FriendlyByteBuf; @@ -57,11 +57,11 @@ public class ZoomMessage { ItemStack stack = entity.getMainHandItem(); - if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + if (stack.is(ModTags.Items.SNIPER_RIFLE)) { zoom_spread = 0; - } else if (stack.is(TargetModTags.Items.SHOTGUN)) { + } else if (stack.is(ModTags.Items.SHOTGUN)) { zoom_spread = 0.9; - } else if (stack.is(TargetModItems.MINIGUN.get())) { + } else if (stack.is(ModItems.MINIGUN.get())) { zoom_spread = 1; } else { zoom_spread = 0.00001; @@ -69,7 +69,7 @@ public class ZoomMessage { if (entity.isPassenger() && entity.getVehicle() instanceof Mk42Entity) { if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.CANNON_ZOOM_IN.get(), 2, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.CANNON_ZOOM_IN.get(), 2, 1); } } } @@ -86,7 +86,7 @@ public class ZoomMessage { zoom_spread = 1; if (entity.isPassenger() && entity.getVehicle() instanceof Mk42Entity) { if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.CANNON_ZOOM_OUT.get(), 2, 1); + SoundTool.playLocalSound(serverPlayer, ModSounds.CANNON_ZOOM_OUT.get(), 2, 1); } } diff --git a/src/main/java/net/mcreator/superbwarfare/tools/MissingMappingHandler.java b/src/main/java/net/mcreator/superbwarfare/tools/MissingMappingHandler.java new file mode 100644 index 000000000..27ab8bdd4 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/tools/MissingMappingHandler.java @@ -0,0 +1,136 @@ +package net.mcreator.superbwarfare.tools; + +import net.mcreator.superbwarfare.ModUtils; +import net.minecraft.core.particles.ParticleType; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.alchemy.Potion; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.MissingMappingsEvent; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE) +public class MissingMappingHandler { + @SubscribeEvent + public static void onMissingMappings(MissingMappingsEvent event) { + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.ITEM)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + Item remappedResource = ForgeRegistries.ITEMS.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.BLOCK)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + Block remappedResource = ForgeRegistries.BLOCKS.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.ENCHANTMENT)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + Enchantment remappedResource = ForgeRegistries.ENCHANTMENTS.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.SOUND_EVENT)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + SoundEvent remappedResource = ForgeRegistries.SOUND_EVENTS.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping> mapping : event.getAllMappings(Registries.BLOCK_ENTITY_TYPE)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + BlockEntityType remappedResource = ForgeRegistries.BLOCK_ENTITY_TYPES.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping> mapping : event.getAllMappings(Registries.ENTITY_TYPE)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + EntityType remappedResource = ForgeRegistries.ENTITY_TYPES.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.ATTRIBUTE)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + Attribute remappedResource = ForgeRegistries.ATTRIBUTES.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.MOB_EFFECT)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + MobEffect remappedResource = ForgeRegistries.MOB_EFFECTS.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.POTION)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + Potion remappedResource = ForgeRegistries.POTIONS.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping> mapping : event.getAllMappings(Registries.MENU)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + MenuType remappedResource = ForgeRegistries.MENU_TYPES.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + + for (MissingMappingsEvent.Mapping> mapping : event.getAllMappings(Registries.PARTICLE_TYPE)) { + if ("target".equals(mapping.getKey().getNamespace())) { + ResourceLocation newResourceLocation = new ResourceLocation(ModUtils.MODID, mapping.getKey().getPath()); + ParticleType remappedResource = ForgeRegistries.PARTICLE_TYPES.getValue(newResourceLocation); + if (remappedResource != null) { + mapping.remap(remappedResource); + } + } + } + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/tools/ParticleTool.java b/src/main/java/net/mcreator/superbwarfare/tools/ParticleTool.java index 8a4cc731d..dcaa475dc 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/ParticleTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/ParticleTool.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.tools; -import net.mcreator.superbwarfare.init.TargetModParticleTypes; -import net.mcreator.superbwarfare.init.TargetModSounds; +import net.mcreator.superbwarfare.init.ModParticleTypes; +import net.mcreator.superbwarfare.init.ModSounds; import net.minecraft.world.level.block.Blocks; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; @@ -32,18 +32,18 @@ public class ParticleTool { if (!level.isClientSide()) { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1); } - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 8, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 16, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 32, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 8, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 16, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 32, 1); } else { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1, false); } - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 24, 1, false); - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 24, 1, false); - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 64, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 24, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 24, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 64, 1, false); } if (level instanceof ServerLevel serverLevel) { @@ -57,7 +57,7 @@ public class ParticleTool { sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y, z, 80, 0.4, 1, 0.4, 0.02, true); sendParticle(serverLevel, ParticleTypes.LARGE_SMOKE, x, y + 1, z, 80, 0.4, 1, 0.4, 0.02, true); sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y, z, 80, 2, 0.001, 2, 0.01, true); - sendParticle(serverLevel, TargetModParticleTypes.FIRE_STAR.get(), x, y, z, 80, 0, 0, 0, 0.2, true); + sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), x, y, z, 80, 0, 0, 0, 0.2, true); } } @@ -69,18 +69,18 @@ public class ParticleTool { if (!level.isClientSide()) { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1); } - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 8, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 16, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), TargetModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 32, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 8, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 16, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 32, 1); } else { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1, false); } - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 24, 1, false); - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 24, 1, false); - level.playLocalSound(x, (y + 1), z, TargetModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 64, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 24, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 24, 1, false); + level.playLocalSound(x, (y + 1), z, ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 64, 1, false); } if (level instanceof ServerLevel serverLevel) { @@ -93,7 +93,7 @@ public class ParticleTool { sendParticle(serverLevel, ParticleTypes.EXPLOSION, x, y + 1, z, 75, 2.5, 2.5, 2.5, 1, true); sendParticle(serverLevel, ParticleTypes.FLASH, x, y + 1, z, 200, 5, 5, 5, 20, true); - sendParticle(serverLevel, TargetModParticleTypes.FIRE_STAR.get(), x, y + 1, z, 400, 0, 0, 0, 1.5, true); + sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), x, y + 1, z, 400, 0, 0, 0, 1.5, true); sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y + 1, z, 75, 2, 3, 2, 0.005, true); sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y, z, 150, 7, 0.1, 7, 0.005, true); sendParticle(serverLevel, ParticleTypes.CLOUD, x, y + 1, z, 200, 3, 4, 3, 0.4, true); @@ -109,7 +109,7 @@ public class ParticleTool { if (level instanceof ServerLevel serverLevel) { sendParticle(serverLevel, ParticleTypes.EXPLOSION, x, y, z, 2, 0.5, 0.5, 0.5, 1, true); sendParticle(serverLevel, ParticleTypes.FLASH, x, y, z, 2, 0.2, 0.2, 0.2, 10, true); - sendParticle(serverLevel, TargetModParticleTypes.FIRE_STAR.get(), x, y, z, 40, 0, 0, 0, 1.5, true); + sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), x, y, z, 40, 0, 0, 0, 1.5, true); } } diff --git a/src/main/java/net/mcreator/superbwarfare/world/inventory/GunRecycleGuiMenu.java b/src/main/java/net/mcreator/superbwarfare/world/inventory/GunRecycleGuiMenu.java index 5d03c75f8..fbb275214 100644 --- a/src/main/java/net/mcreator/superbwarfare/world/inventory/GunRecycleGuiMenu.java +++ b/src/main/java/net/mcreator/superbwarfare/world/inventory/GunRecycleGuiMenu.java @@ -1,7 +1,7 @@ package net.mcreator.superbwarfare.world.inventory; -import net.mcreator.superbwarfare.init.TargetModMenus; -import net.mcreator.superbwarfare.init.TargetModTags; +import net.mcreator.superbwarfare.init.ModMenus; +import net.mcreator.superbwarfare.init.ModTags; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; @@ -37,7 +37,7 @@ public class GunRecycleGuiMenu extends AbstractContainerMenu implements Supplier private BlockEntity boundBlockEntity = null; public GunRecycleGuiMenu(int id, Inventory inv, FriendlyByteBuf extraData) { - super(TargetModMenus.GUN_RECYCLE_GUI.get(), id); + super(ModMenus.GUN_RECYCLE_GUI.get(), id); this.entity = inv.player; this.world = inv.player.level(); this.internal = new ItemStackHandler(1); @@ -80,7 +80,7 @@ public class GunRecycleGuiMenu extends AbstractContainerMenu implements Supplier this.customSlots.put(0, this.addSlot(new SlotItemHandler(internal, 0, 79, 27) { @Override public boolean mayPlace(ItemStack stack) { - return stack.is(TargetModTags.Items.GUN); + return stack.is(ModTags.Items.GUN); } })); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index a93609e4a..9b905f081 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -1,7 +1,7 @@ { - "item_group.superbwarfare.target_guns": "TARGET GUN", - "item_group.superbwarfare.target_item": "TARGET ITEM", - "item_group.superbwarfare.ammo": "TARGET AMMO", + "item_group.superbwarfare.guns": "Superb Warfare Guns", + "item_group.superbwarfare.item": "Superb Warfare Items", + "item_group.superbwarfare.ammo": "Superb Warfare Ammo", "item.superbwarfare.ammo.shotgun": "Shotgun", "item.superbwarfare.ammo.handgun": "Handgun", @@ -201,7 +201,7 @@ "entity.superbwarfare.mk_42": "5''/54 Mk42", "entity.superbwarfare.drone": "Drone", - "key.categories.target": "TARGET", + "key.categories.superbwarfare": "Superb Warfare", "key.superbwarfare.reload": "Reload", "key.superbwarfare.double_jump": "Double Jump", "key.superbwarfare.fire_mode": "Fire Mode", @@ -210,15 +210,15 @@ "key.superbwarfare.interact": "Interact", "effect.superbwarfare.shock": "Shock", - "item.minecraft.potion.effect.target_shock": "Potion of Shock", - "item.minecraft.splash_potion.effect.target_shock": "Splash Potion of Shock", - "item.minecraft.lingering_potion.effect.target_shock": "Lingering Potion of Shock", - "item.minecraft.potion.effect.target_strong_shock": "Potion of Shock", - "item.minecraft.splash_potion.effect.target_strong_shock": "Splash Potion of Shock", - "item.minecraft.lingering_potion.effect.target_strong_shock": "Lingering Potion of Shock", - "item.minecraft.potion.effect.target_long_shock": "Potion of Shock", - "item.minecraft.splash_potion.effect.target_long_shock": "Splash Potion of Shock", - "item.minecraft.lingering_potion.effect.target_long_shock": "Lingering Potion of Shock", + "item.minecraft.potion.effect.superbwarfare_shock": "Potion of Shock", + "item.minecraft.splash_potion.effect.superbwarfare_shock": "Splash Potion of Shock", + "item.minecraft.lingering_potion.effect.superbwarfare_shock": "Lingering Potion of Shock", + "item.minecraft.potion.effect.superbwarfare_strong_shock": "Potion of Shock", + "item.minecraft.splash_potion.effect.superbwarfare_strong_shock": "Splash Potion of Shock", + "item.minecraft.lingering_potion.effect.superbwarfare_strong_shock": "Lingering Potion of Shock", + "item.minecraft.potion.effect.superbwarfare_long_shock": "Potion of Shock", + "item.minecraft.splash_potion.effect.superbwarfare_long_shock": "Splash Potion of Shock", + "item.minecraft.lingering_potion.effect.superbwarfare_long_shock": "Lingering Potion of Shock", "enchantment.superbwarfare.volt_overload": "Volt Overload", "enchantment.superbwarfare.volt_overload.desc": "Increases the shock damage of TaserGun", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 500206ac8..47d73e31c 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -1,7 +1,7 @@ { - "item_group.superbwarfare.target_guns": "TARGET枪械", - "item_group.superbwarfare.target_item": "TARGET物品", - "item_group.superbwarfare.ammo": "TARGET弹药", + "item_group.superbwarfare.guns": "卓越前线：枪械", + "item_group.superbwarfare.item": "卓越前线：物品", + "item_group.superbwarfare.ammo": "卓越前线：弹药", "item.superbwarfare.ammo.shotgun": "霰弹枪", "item.superbwarfare.ammo.handgun": "手枪", @@ -201,7 +201,7 @@ "entity.superbwarfare.mk_42": "5''/54 Mk42", "entity.superbwarfare.drone": "无人机", - "key.categories.target": "TARGET", + "key.categories.superbwarfare": "卓越前线", "key.superbwarfare.reload": "装填子弹", "key.superbwarfare.double_jump": "二段跳", "key.superbwarfare.fire_mode": "开火模式", @@ -210,15 +210,15 @@ "key.superbwarfare.interact": "交互", "effect.superbwarfare.shock": "电击", - "item.minecraft.potion.effect.target_shock": "电击药水", - "item.minecraft.splash_potion.effect.target_shock": "喷溅型电击药水", - "item.minecraft.lingering_potion.effect.target_shock": "滞留型电击药水", - "item.minecraft.potion.effect.target_strong_shock": "电击药水", - "item.minecraft.splash_potion.effect.target_strong_shock": "喷溅型电击药水", - "item.minecraft.lingering_potion.effect.target_strong_shock": "滞留型电击药水", - "item.minecraft.potion.effect.target_long_shock": "电击药水", - "item.minecraft.splash_potion.effect.target_long_shock": "喷溅型电击药水", - "item.minecraft.lingering_potion.effect.target_long_shock": "滞留型电击药水", + "item.minecraft.potion.effect.superbwarfare_shock": "电击药水", + "item.minecraft.splash_potion.effect.superbwarfare_shock": "喷溅型电击药水", + "item.minecraft.lingering_potion.effect.superbwarfare_shock": "滞留型电击药水", + "item.minecraft.potion.effect.superbwarfare_strong_shock": "电击药水", + "item.minecraft.splash_potion.effect.superbwarfare_strong_shock": "喷溅型电击药水", + "item.minecraft.lingering_potion.effect.superbwarfare_strong_shock": "滞留型电击药水", + "item.minecraft.potion.effect.superbwarfare_long_shock": "电击药水", + "item.minecraft.splash_potion.effect.superbwarfare_long_shock": "喷溅型电击药水", + "item.minecraft.lingering_potion.effect.superbwarfare_long_shock": "滞留型电击药水", "enchantment.superbwarfare.volt_overload": "电压过载", "enchantment.superbwarfare.volt_overload.desc": "增加泰瑟枪电击的伤害",