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

加入战术冲刺功能和动画

Browse source
This commit is contained in:
Atsuihsio 2024-07-29 17:07:49 +08:00
parent 6ac6493a5b
commit 8bf3f8a41f
106 changed files with 8562 additions and 12212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/net/mcreator/superbwarfare/ModUtils.java
View file

@ -108,6 +108,7 @@ public class ModUtils {
addNetworkMessage(DroneMovementMessage.class, DroneMovementMessage::encode, DroneMovementMessage::decode, DroneMovementMessage::handler);
addNetworkMessage(DroneFireMessage.class, DroneFireMessage::buffer, DroneFireMessage::new, DroneFireMessage::handler);
addNetworkMessage(SimulationDistanceMessage.class, SimulationDistanceMessage::encode, SimulationDistanceMessage::decode, SimulationDistanceMessage::handle, Optional.of(NetworkDirection.PLAY_TO_CLIENT));
addNetworkMessage(TacticalSprintMessage.class, TacticalSprintMessage::encode, TacticalSprintMessage::decode, TacticalSprintMessage::handler);
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), ModPotion.SHOCK.get())));

6
src/main/java/net/mcreator/superbwarfare/block/JumpPadBlock.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.block;
import net.mcreator.superbwarfare.entity.Mk42Entity;
import net.mcreator.superbwarfare.entity.Target1Entity;
import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.sounds.SoundSource;
@ -80,7 +80,7 @@ public class JumpPadBlock extends Block {
// 禁止套娃
if (entity instanceof Target1Entity || entity instanceof Mk42Entity) return;
boolean zooming = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.zooming).orElse(false);
boolean zooming = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.zooming).orElse(false);
if (entity.isShiftKeyDown()) {
if (entity.onGround()) {
@ -102,7 +102,7 @@ public class JumpPadBlock extends Block {
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 -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.playerDoubleJump = true;
capability.syncPlayerVariables(entity);
});

4
src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
View file

@ -7,7 +7,7 @@ import net.mcreator.superbwarfare.entity.MortarEntity;
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.ModVariables;
import net.mcreator.superbwarfare.network.message.*;
import net.mcreator.superbwarfare.tools.TraceTool;
import net.minecraft.client.Minecraft;
@ -112,7 +112,7 @@ public class ClickHandler {
double scroll = event.getScrollDelta();
if (stack.is(ModTags.Items.GUN) && (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) {
if (stack.is(ModTags.Items.GUN) && (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
var tag = stack.getOrCreateTag();
if (tag.getDouble("min_zoom") != 0 && tag.getDouble("max_zoom") != 0) {
ModUtils.PACKET_HANDLER.sendToServer(new AdjustZoomFovMessage(scroll));

6
src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -67,7 +67,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(0.2f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -78,7 +78,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
shen.setRotX(0.07f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
shuan.setPosZ(2.4f * (float) fp);

6
src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -52,7 +52,7 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(1.3f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -63,7 +63,7 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
shen.setRotX(0.07f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone flare = getAnimationProcessor().getBone("flare");

4
src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -97,7 +97,7 @@ public class BocekItemModel extends GeoModel<BocekItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
fire.setPosY(-0.01f * (float) (fp + 2 * fr));
fire.setPosZ(3f * (float) (fp + 0.54f * fr));
fire.setRotX(0.003f * (float) (fp + fr));

6
src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -79,7 +79,7 @@ public class DevotionItemModel extends GeoModel<Devotion> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.05f * (float) (fp + 2 * fr));
holo.setPosY(-0.03f * (float) (fp + 2.3 * fr));
shen.setPosZ(1.1f * (float) (fp + 0.54f * fr));
@ -90,7 +90,7 @@ public class DevotionItemModel extends GeoModel<Devotion> {
shen.setRotX(0.02f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
if (stack.getOrCreateTag().getDouble("flash_time") > 0) {
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));

6
src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -73,7 +73,7 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.05f * (float) (fp + 2 * fr));
holo.setPosY(-0.43f * (float) (fp + 2.3 * fr));
shen.setPosZ(1.1f * (float) (fp + 0.54f * fr));
@ -84,7 +84,7 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
shen.setRotX(0.03f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone root = getAnimationProcessor().getBone("root");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -58,7 +58,7 @@ public class M4ItemModel extends GeoModel<M4Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(0.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -69,7 +69,7 @@ public class M4ItemModel extends GeoModel<M4Item> {
shen.setRotX(0.03f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone flare = getAnimationProcessor().getBone("flare");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -99,7 +99,7 @@ public class M60ItemModel extends GeoModel<M60Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(-0.03f * (float) (fp + 2 * fr));
shen.setPosZ(0.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -110,7 +110,7 @@ public class M60ItemModel extends GeoModel<M60Item> {
shen.setRotX(0.04f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
tiba.setRotZ((float) (-0.25f * fp + 0.4 * fr));

6
src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -68,7 +68,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.1f * (float) (fp + fr));
@ -79,7 +79,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
shen.setRotX(0.1f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone root = getAnimationProcessor().getBone("root");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -56,7 +56,7 @@ public class M870ItemModel extends GeoModel<M870Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.2f * (float) (fp + 2 * fr));
shen.setPosZ(2.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.28f * (float) (fp + fr));
@ -67,7 +67,7 @@ public class M870ItemModel extends GeoModel<M870Item> {
shen.setRotX(0.3f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone flare = getAnimationProcessor().getBone("flare");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -43,7 +43,7 @@ public class M98bItemModel extends GeoModel<M98bItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.18f * (float) (fp + fr));
@ -54,7 +54,7 @@ public class M98bItemModel extends GeoModel<M98bItem> {
shen.setRotX(0.25f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
double p = 0;
p = player.getPersistentData().getDouble("zoom_pos");

4
src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -62,7 +62,7 @@ public class MinigunItemModel extends GeoModel<Minigun> {
shen.setPosZ(2.2f * (float) (0.5 * fp + 1.54f * fr));
shen.setRotX(0.05f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.02f * (float) (fp + 1.3 * fr));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
flare.setHidden(false);

12
src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -68,7 +68,7 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
gun.setScaleZ(1f - (0.7f * (float) p));
scope.setScaleZ(1f - (0.85f * (float) p));
scope.setScaleZ(1f - (0.7f * (float) p));
yugu.setScaleZ(1f - (0.7f * (float) p));
@ -77,11 +77,11 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.06f * (float) (fp + 2 * fr));
shen.setPosZ(0.9f * (float) (fp + 0.54f * fr));
shen.setRotX(0.005f * (float) (fp + fr));
shen.setRotZ(0.01f * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp) * (float) fp);
shen.setRotZ(0.01f * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp) * (float) fp);
} else {
shen.setPosY(0.04f * (float) (fp + 2 * fr));
shen.setPosZ(1.2f * (float) (fp + 0.54f * fr));
@ -89,11 +89,11 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
rex.setRotZ(0.01f * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp) * (float) fp);
rex.setRotZ(0.01f * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp) * (float) fp);
rex.setPosY(-0.23f * (float) (fp + 2.3 * fr));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
action.setPosZ(2.5f * (float) fp);

6
src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -56,7 +56,7 @@ public class Ntw20Model extends GeoModel<Ntw20> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.1f * (float) (fp + fr));
@ -68,7 +68,7 @@ public class Ntw20Model extends GeoModel<Ntw20> {
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
double p = player.getPersistentData().getDouble("zoom_pos");
double zp = player.getPersistentData().getDouble("zoom_pos_z");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -50,7 +50,7 @@ public class RpgItemModel extends GeoModel<RpgItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(1.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -61,7 +61,7 @@ public class RpgItemModel extends GeoModel<RpgItem> {
shen.setRotX(0.07f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
double p = 0;
p = player.getPersistentData().getDouble("zoom_pos");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -89,7 +89,7 @@ public class RpkItemModel extends GeoModel<RpkItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(0.2f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -100,7 +100,7 @@ public class RpkItemModel extends GeoModel<RpkItem> {
shen.setRotX(0.04f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
shuan.setPosZ(2.4f * (float) fp);

6
src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -82,7 +82,7 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.12f * (float) (fp + fr));
@ -93,7 +93,7 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
shen.setRotX(0.15f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone charge = getAnimationProcessor().getBone("charge");

6
src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -74,7 +74,7 @@ public class SksItemModel extends GeoModel<SksItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.04f * (float) (fp + 2 * fr));
holo.setPosY(-0.43f * (float) (fp + 2.3 * fr));
shen.setPosZ(0.6f * (float) (fp + 0.54f * fr));
@ -85,7 +85,7 @@ public class SksItemModel extends GeoModel<SksItem> {
shen.setRotX(0.07f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
shuan.setPosZ(2f * (float) fp);

6
src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -94,7 +94,7 @@ public class SvdItemModel extends GeoModel<SvdItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(1.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
@ -105,7 +105,7 @@ public class SvdItemModel extends GeoModel<SvdItem> {
shen.setRotX(0.07f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
holo.setPosY(1.1f * (float) fp);

8
src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.client.model.item;
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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -68,7 +68,7 @@ public class VectorItemModel extends GeoModel<VectorItem> {
scope.setScaleZ(1f - (0.2f * (float) p));
CoreGeoBone holo = getAnimationProcessor().getBone("holo");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming && gun.getPosX() > 2) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming && gun.getPosX() > 2) {
holo.setHidden(false);
} else {
holo.setHidden(true);
@ -77,7 +77,7 @@ public class VectorItemModel extends GeoModel<VectorItem> {
double fp = player.getPersistentData().getDouble("fire_pos");
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.05f * (float) (fp + 2 * fr));
holo.setPosY(-0.43f * (float) (fp + 2.3 * fr));
shen.setPosZ(0.9f * (float) (fp + 0.54f * fr));
@ -88,7 +88,7 @@ public class VectorItemModel extends GeoModel<VectorItem> {
shen.setRotX(0.03f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp));
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone root = getAnimationProcessor().getBone("root");

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

@ -6,7 +6,7 @@ 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.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
@ -157,7 +157,7 @@ public class AmmoBarOverlay {
ItemStack stack = player.getMainHandItem();
if (stack.getItem() == ModItems.MINIGUN.get()) {
return (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo;
return (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).rifleAmmo;
}
if (stack.getItem() == ModItems.BOCEK.get()) {
@ -179,16 +179,16 @@ public class AmmoBarOverlay {
}
if (stack.is(ModTags.Items.RIFLE)) {
return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo;
return "" + (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).rifleAmmo;
}
if (stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG)) {
return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo;
return "" + (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).handgunAmmo;
}
if (stack.is(ModTags.Items.SHOTGUN)) {
return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo;
return "" + (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).shotgunAmmo;
}
if (stack.is(ModTags.Items.SNIPER_RIFLE)) {
return "" + (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo;
return "" + (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).sniperAmmo;
}
return "";
}

4
src/main/java/net/mcreator/superbwarfare/client/screens/CrossHairOverlay.java
View file

@ -4,7 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.CameraType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
@ -94,7 +94,7 @@ public class CrossHairOverlay {
if (player == null) return false;
if (player.isSpectator()) return false;
if (!player.getMainHandItem().is(ModTags.Items.GUN) || (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming)
if (!player.getMainHandItem().is(ModTags.Items.GUN) || (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming)
return false;
return !(player.getMainHandItem().getItem() == ModItems.M_79.get())

6
src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java
View file

@ -4,7 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.mcreator.superbwarfare.entity.Mk42Entity;
import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.CameraType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer;
@ -44,13 +44,13 @@ public class M79UIOverlay {
return !player.isSpectator()
&& 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);
&& !player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.zooming).orElse(false);
}
private static boolean shouldRenderCrossHair2(Player player) {
if (player == null) return false;
return !player.isSpectator()
&& !(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom
&& !(player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom
&& player.isPassenger() && player.getVehicle() instanceof Mk42Entity;
}
}

4
src/main/java/net/mcreator/superbwarfare/client/screens/Mk42UIOverlay.java
View file

@ -4,7 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.mcreator.superbwarfare.entity.Mk42Entity;
import net.mcreator.superbwarfare.item.gun.GunItem;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.RenderTool;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer;
@ -51,6 +51,6 @@ public class Mk42UIOverlay {
&& !(player.getMainHandItem().getItem() instanceof GunItem)
// && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON
&& (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity)
&& (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom;
&& (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom;
}
}

8
src/main/java/net/mcreator/superbwarfare/command/AmmoCommand.java
View file

@ -2,7 +2,7 @@
package net.mcreator.superbwarfare.command;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.GunInfo;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.EntityArgument;
@ -23,7 +23,7 @@ public class AmmoCommand {
var type = context.getArgument("type", GunInfo.Type.class);
var value = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c ->
var value = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c ->
switch (type) {
case HANDGUN -> c.handgunAmmo;
case RIFLE -> c.rifleAmmo;
@ -40,7 +40,7 @@ public class AmmoCommand {
var value = IntegerArgumentType.getInteger(context, "value");
for (var player : players) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
switch (type) {
case HANDGUN -> capability.handgunAmmo = value;
case RIFLE -> capability.rifleAmmo = value;
@ -60,7 +60,7 @@ public class AmmoCommand {
var value = IntegerArgumentType.getInteger(context, "value");
for (var player : players) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
switch (type) {
case HANDGUN -> capability.handgunAmmo += value;
case RIFLE -> capability.rifleAmmo += value;

4
src/main/java/net/mcreator/superbwarfare/command/PVPModeCommand.java
View file

@ -1,7 +1,7 @@
package net.mcreator.superbwarfare.command;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
@ -24,7 +24,7 @@ public class PVPModeCommand {
entity = FakePlayerFactory.getMinecraft(server);
}
var mapVariables = TargetModVariables.MapVariables.get(world);
var mapVariables = ModVariables.MapVariables.get(world);
mapVariables.pvpMode = !mapVariables.pvpMode;
mapVariables.syncData(world);

118
src/main/java/net/mcreator/superbwarfare/entity/DroneEntity.java
View file

@ -71,12 +71,12 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
public static final EntityDataAccessor<String> CONTROLLER = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.STRING);
public static final EntityDataAccessor<Integer> AMMO = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.INT);
public static final EntityDataAccessor<Boolean> KAMIKAZE = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.BOOLEAN);
public static final EntityDataAccessor<Float> MOVE_X = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> MOVE_Y = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> MOVE_Z = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> ROT_X = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> ROT_Z = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> MOVEX = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> MOVEY = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> MOVEZ = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> ROTX = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> ROTZ = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
private boolean move = false;
@ -108,11 +108,11 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
this.entityData.define(LINKED, false);
this.entityData.define(AMMO, 0);
this.entityData.define(KAMIKAZE, false);
this.entityData.define(MOVE_X, 0f);
this.entityData.define(MOVE_Y, 0f);
this.entityData.define(MOVE_Z, 0f);
this.entityData.define(ROT_X, 0f);
this.entityData.define(ROT_Z, 0f);
this.entityData.define(MOVEX, 0f);
this.entityData.define(MOVEY, 0f);
this.entityData.define(MOVEZ, 0f);
this.entityData.define(ROTX, 0f);
this.entityData.define(ROTZ, 0f);
}
@Override
@ -153,11 +153,11 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
compound.putString("Controller", this.entityData.get(CONTROLLER));
compound.putInt("ammo", this.entityData.get(AMMO));
compound.putBoolean("Kamikaze", this.entityData.get(KAMIKAZE));
compound.putFloat("moveX", this.entityData.get(MOVE_X));
compound.putFloat("moveY", this.entityData.get(MOVE_Y));
compound.putFloat("moveZ", this.entityData.get(MOVE_Z));
compound.putFloat("rotX", this.entityData.get(ROT_X));
compound.putFloat("rotZ", this.entityData.get(ROT_Z));
compound.putFloat("moveX", this.entityData.get(MOVEX));
compound.putFloat("moveY", this.entityData.get(MOVEY));
compound.putFloat("moveZ", this.entityData.get(MOVEZ));
compound.putFloat("rotX", this.entityData.get(ROTX));
compound.putFloat("rotZ", this.entityData.get(ROTZ));
}
@Override
@ -173,15 +173,15 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
if (compound.contains("Kamikaze"))
this.entityData.set(KAMIKAZE, compound.getBoolean("Kamikaze"));
if (compound.contains("moveX"))
this.entityData.set(MOVE_X, compound.getFloat("moveX"));
this.entityData.set(MOVEX, compound.getFloat("moveX"));
if (compound.contains("moveY"))
this.entityData.set(MOVE_Y, compound.getFloat("moveY"));
this.entityData.set(MOVEY, compound.getFloat("moveY"));
if (compound.contains("moveZ"))
this.entityData.set(MOVE_Z, compound.getFloat("moveZ"));
this.entityData.set(MOVEZ, compound.getFloat("moveZ"));
if (compound.contains("rotX"))
this.entityData.set(ROT_X, compound.getFloat("rotX"));
this.entityData.set(ROTX, compound.getFloat("rotX"));
if (compound.contains("rotZ"))
this.entityData.set(ROT_Z, compound.getFloat("rotZ"));
this.entityData.set(ROTZ, compound.getFloat("rotZ"));
}
@Override
@ -189,66 +189,66 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
super.baseTick();
if (this.getPersistentData().getBoolean("left")) {
this.entityData.set(MOVE_X, -1.5f);
this.entityData.set(ROT_X, Mth.clamp(this.entityData.get(ROT_X) + 0.05f, -0.5f, 0.5f));
this.entityData.set(MOVEX,-1.5f);
this.entityData.set(ROTX,Mth.clamp(this.entityData.get(ROTX) + 0.05f, -0.5f, 0.5f));
}
if (this.getPersistentData().getBoolean("right")) {
this.entityData.set(MOVE_X, 1.5f);
this.entityData.set(ROT_X, Mth.clamp(this.entityData.get(ROT_X) - 0.05f, -0.5f, 0.5f));
this.entityData.set(MOVEX,1.5f);
this.entityData.set(ROTX,Mth.clamp(this.entityData.get(ROTX) - 0.05f, -0.5f, 0.5f));
}
if (this.entityData.get(ROT_X) > 0) {
this.entityData.set(ROT_X, Mth.clamp(this.entityData.get(ROT_X) - 0.025f, 0, 0.5f));
if (this.entityData.get(ROTX) > 0) {
this.entityData.set(ROTX, Mth.clamp(this.entityData.get(ROTX) - 0.025f, 0, 0.5f));
} else {
this.entityData.set(ROT_X, Mth.clamp(this.entityData.get(ROT_X) + 0.025f, -0.5f, 0));
this.entityData.set(ROTX, Mth.clamp(this.entityData.get(ROTX) + 0.025f, -0.5f, 0));
}
if (!this.getPersistentData().getBoolean("left") && !this.getPersistentData().getBoolean("right")) {
if (this.entityData.get(MOVE_X) >= 0) {
this.entityData.set(MOVE_X, Mth.clamp(this.entityData.get(MOVE_X) - 0.3f, 0, 1));
if (this.entityData.get(MOVEX) >= 0) {
this.entityData.set(MOVEX,Mth.clamp(this.entityData.get(MOVEX) - 0.3f, 0, 1));
} else {
this.entityData.set(MOVE_X, Mth.clamp(this.entityData.get(MOVE_X) + 0.3f, -1, 0));
this.entityData.set(MOVEX,Mth.clamp(this.entityData.get(MOVEX) + 0.3f, -1, 0));
}
}
if (this.getPersistentData().getBoolean("forward")) {
this.entityData.set(MOVE_Z, this.entityData.get(MOVE_Z) - 0.15f);
this.entityData.set(ROT_Z, Mth.clamp(this.entityData.get(ROT_Z) - 0.05f, -0.5f, 0.5f));
this.entityData.set(MOVEZ,this.entityData.get(MOVEZ) - 0.15f);
this.entityData.set(ROTZ,Mth.clamp(this.entityData.get(ROTZ) - 0.05f, -0.5f, 0.5f));
}
if (this.getPersistentData().getBoolean("backward")) {
this.entityData.set(MOVE_Z, this.entityData.get(MOVE_Z) + 0.15f);
this.entityData.set(ROT_Z, Mth.clamp(this.entityData.get(ROT_Z) + 0.05f, -0.5f, 0.5f));
this.entityData.set(MOVEZ,this.entityData.get(MOVEZ) + 0.15f);
this.entityData.set(ROTZ,Mth.clamp(this.entityData.get(ROTZ) + 0.05f, -0.5f, 0.5f));
}
if (this.entityData.get(ROT_Z) > 0) {
this.entityData.set(ROT_Z, Mth.clamp(this.entityData.get(ROT_Z) - 0.025f, 0, 0.5f));
if (this.entityData.get(ROTZ) > 0) {
this.entityData.set(ROTZ, Mth.clamp(this.entityData.get(ROTZ) - 0.025f, 0, 0.5f));
} else {
this.entityData.set(ROT_Z, Mth.clamp(this.entityData.get(ROT_Z) + 0.025f, -0.5f, 0));
this.entityData.set(ROTZ, Mth.clamp(this.entityData.get(ROTZ) + 0.025f, -0.5f, 0));
}
if (this.entityData.get(MOVE_Z) >= 0) {
this.entityData.set(MOVE_Z, Mth.clamp(this.entityData.get(MOVE_Z) - 0.1f, 0, 1));
if (this.entityData.get(MOVEZ) >= 0) {
this.entityData.set(MOVEZ,Mth.clamp(this.entityData.get(MOVEZ) - 0.1f, 0, 1));
} else {
this.entityData.set(MOVE_Z, Mth.clamp(this.entityData.get(MOVE_Z) + 0.1f, -1, 0));
this.entityData.set(MOVEZ,Mth.clamp(this.entityData.get(MOVEZ) + 0.1f, -1, 0));
}
if (this.getPersistentData().getBoolean("up")) {
this.entityData.set(MOVE_Y, -1.5f);
this.entityData.set(MOVEY,-1.5f);
}
if (this.getPersistentData().getBoolean("down")) {
this.entityData.set(MOVE_Y, 1.5f);
this.entityData.set(MOVEY,1.5f);
}
if (this.entityData.get(MOVE_Y) >= 0) {
this.entityData.set(MOVE_Y, Mth.clamp(this.entityData.get(MOVE_Y) - 0.3f, 0, 1));
if (this.entityData.get(MOVEY) >= 0) {
this.entityData.set(MOVEY,Mth.clamp(this.entityData.get(MOVEY) - 0.3f, 0, 1));
} else {
this.entityData.set(MOVE_Y, Mth.clamp(this.entityData.get(MOVE_Y) + 0.3f, -1, 0));
this.entityData.set(MOVEY,Mth.clamp(this.entityData.get(MOVEY)+ 0.3f, -1, 0));
}
this.setDeltaMovement(new Vec3(
this.getDeltaMovement().x + -this.entityData.get(MOVE_Z) * 0.1f * this.getLookAngle().x,
this.getDeltaMovement().y + -this.entityData.get(MOVE_Y) * 0.05f,
this.getDeltaMovement().z + -this.entityData.get(MOVE_Z) * 0.1f * this.getLookAngle().z
this.getDeltaMovement().x + -this.entityData.get(MOVEZ) * 0.1f * this.getLookAngle().x,
this.getDeltaMovement().y + -this.entityData.get(MOVEY) * 0.05f,
this.getDeltaMovement().z + -this.entityData.get(MOVEZ) * 0.1f * this.getLookAngle().z
));
this.move = this.getPersistentData().getBoolean("left")
@ -282,11 +282,11 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
if (this.getPersistentData().getBoolean("firing")) {
if (control instanceof Player player) {
if (this.entityData.get(AMMO) > 0) {
this.entityData.set(AMMO, this.entityData.get(AMMO) - 1);
this.entityData.set(AMMO,this.entityData.get(AMMO) - 1);
droneDrop(player);
}
if (this.entityData.get(KAMIKAZE)) {
this.hurt(new DamageSource(level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.EXPLOSION), player), 10000);
this.hurt(new DamageSource(level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.EXPLOSION),player), 10000);
}
}
this.getPersistentData().putBoolean("firing", false);
@ -359,7 +359,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
stack.shrink(1);
}
if (this.entityData.get(AMMO) < 6) {
this.entityData.set(AMMO, this.entityData.get(AMMO) + 1);
this.entityData.set(AMMO,this.entityData.get(AMMO) + 1);
if (player instanceof ServerPlayer serverPlayer) {
serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1);
}
@ -368,7 +368,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
if (!player.isCreative()) {
stack.shrink(1);
}
this.entityData.set(KAMIKAZE, true);
this.entityData.set(KAMIKAZE,true);
if (player instanceof ServerPlayer serverPlayer) {
serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1);
}
@ -392,8 +392,8 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
this.yBodyRot = control.getYRot();
this.yHeadRot = control.getYRot();
this.setSpeed((float) this.getAttributeValue(Attributes.MOVEMENT_SPEED));
float strafe = -this.entityData.get(MOVE_X);
super.travel(new Vec3(2 * strafe, -this.entityData.get(MOVE_Y), -this.entityData.get(MOVE_Z)));
float strafe = -this.entityData.get(MOVEX);
super.travel(new Vec3(2 * strafe, -this.entityData.get(MOVEY), -this.entityData.get(MOVEZ)));
Vec3 vec3 = this.getDeltaMovement();
if (this.onGround()) {
this.setDeltaMovement(vec3.multiply(0.7, 0.98, 0.7));
@ -432,7 +432,8 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
});
}
if (this.entityData.get(KAMIKAZE)) {
if (this.entityData.get(KAMIKAZE)){
kamikazeExplosion(source.getEntity());
}
@ -489,7 +490,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
return builder;
}
private PlayState movementPredicate(AnimationState<DroneEntity> event) {
private PlayState movementPredicate(AnimationState event) {
if (this.animationprocedure.equals("empty")) {
if (!this.onGround()) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.drone.fly"));
@ -499,7 +500,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
return PlayState.STOP;
}
private PlayState procedurePredicate(AnimationState<DroneEntity> event) {
private PlayState procedurePredicate(AnimationState event) {
if (!animationprocedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) {
event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationprocedure));
if (event.getController().getAnimationState() == AnimationController.State.STOPPED) {
@ -534,10 +535,9 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
private final ItemStackHandler inventory = new ItemStackHandler(9) {
@Override
public int getSlotLimit(int slot) {
return super.getSlotLimit(slot);
return 64;
}
};
private final CombinedInvWrapper combined = new CombinedInvWrapper(inventory, new EntityHandsInvWrapper(this), new EntityArmorInvWrapper(this));
@Override

1
src/main/java/net/mcreator/superbwarfare/entity/DroneGrenadeEntity.java
View file

@ -22,6 +22,7 @@ import net.minecraftforge.network.PlayMessages;
public class DroneGrenadeEntity extends ThrowableItemProjectile {
public DroneGrenadeEntity(EntityType<? extends DroneGrenadeEntity> type, Level world) {
super(type, world);
}

10
src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java
View file

@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.entity;
import net.mcreator.superbwarfare.init.*;
import net.mcreator.superbwarfare.item.common.ammo.CannonShellItem;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.CustomExplosion;
import net.mcreator.superbwarfare.tools.ParticleTool;
import net.mcreator.superbwarfare.tools.SoundTool;
@ -245,7 +245,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity {
}
if (this.getPersistentData().getInt("fire_cooldown") > 28) {
gunner.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
gunner.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
if (Math.random() < 0.5) {
capability.recoilHorizon = -1;
@ -449,9 +449,9 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity {
if (this.getFirstPassenger() != null) {
Entity gunner = this.getFirstPassenger();
var capability = gunner.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null);
if (capability.orElse(new TargetModVariables.PlayerVariables()).cannonRecoil > 0) {
if (capability.orElse(new TargetModVariables.PlayerVariables()).recoilHorizon == 1) {
var capability = gunner.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null);
if (capability.orElse(new ModVariables.PlayerVariables()).cannonRecoil > 0) {
if (capability.orElse(new ModVariables.PlayerVariables()).recoilHorizon == 1) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk42.fire"));
} else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk42.fire2"));

4
src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.entity;
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.network.ModVariables;
import net.mcreator.superbwarfare.tools.SoundTool;
import net.minecraft.commands.arguments.EntityAnchorArgument;
import net.minecraft.core.BlockPos;
@ -187,7 +187,7 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
player.addItem(new ItemStack(ModItems.TARGET_DEPLOYER.get()));
} else {
if (!(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if (!(player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
this.lookAt(EntityAnchorArgument.Anchor.EYES, new Vec3((player.getX()), this.getY(), (player.getZ())));
this.setYRot(this.getYRot());

6
src/main/java/net/mcreator/superbwarfare/entity/model/DroneModel.java
View file

@ -6,7 +6,6 @@ import software.bernie.geckolib.core.animation.AnimationState;
import software.bernie.geckolib.model.GeoModel;
import net.minecraft.resources.ResourceLocation;
import net.mcreator.superbwarfare.entity.DroneEntity;
import static net.mcreator.superbwarfare.entity.DroneEntity.*;
public class DroneModel extends GeoModel<DroneEntity> {
@ -45,7 +44,8 @@ public class DroneModel extends GeoModel<DroneEntity> {
ammo1.setHidden(animatable.getEntityData().get(AMMO) <= 0);
shell.setHidden(!animatable.getEntityData().get(KAMIKAZE));
body.setRotZ(animatable.getEntityData().get(ROT_X));
body.setRotX(animatable.getEntityData().get(ROT_Z));
body.setRotZ(animatable.getEntityData().get(ROTX));
body.setRotX(animatable.getEntityData().get(ROTZ));
}
}

32
src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
View file

@ -5,7 +5,7 @@ import net.mcreator.superbwarfare.entity.Mk42Entity;
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.ModVariables;
import net.mcreator.superbwarfare.network.message.ZoomMessage;
import net.minecraft.client.CameraType;
import net.minecraft.client.Minecraft;
@ -28,8 +28,8 @@ import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import static net.mcreator.superbwarfare.entity.DroneEntity.ROT_X;
import static net.mcreator.superbwarfare.entity.DroneEntity.ROT_Z;
import static net.mcreator.superbwarfare.entity.DroneEntity.ROTX;
import static net.mcreator.superbwarfare.entity.DroneEntity.ROTZ;
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class ClientEventHandler {
@ -92,16 +92,16 @@ public class ClientEventHandler {
if (drone != null) {
if (data.getDouble("droneRotZ") > drone.getEntityData().get(ROT_Z)) {
data.putDouble("droneRotZ", Mth.clamp(data.getDouble("droneRotZ") - 0.3 * Math.pow(drone.getEntityData().get(ROT_Z) - data.getDouble("droneRotZ"), 2),drone.getEntityData().get(ROT_Z),Double.POSITIVE_INFINITY));
if (data.getDouble("droneRotZ") > drone.getEntityData().get(ROTZ)) {
data.putDouble("droneRotZ", Mth.clamp(data.getDouble("droneRotZ") - 0.3 * Math.pow(drone.getEntityData().get(ROTZ) - data.getDouble("droneRotZ"), 2),drone.getEntityData().get(ROTZ),Double.POSITIVE_INFINITY));
} else {
data.putDouble("droneRotZ", Mth.clamp(data.getDouble("droneRotZ") + 0.3 * Math.pow(drone.getEntityData().get(ROT_Z) - data.getDouble("droneRotZ"), 2),Double.NEGATIVE_INFINITY,drone.getEntityData().get(ROT_Z)));
data.putDouble("droneRotZ", Mth.clamp(data.getDouble("droneRotZ") + 0.3 * Math.pow(drone.getEntityData().get(ROTZ) - data.getDouble("droneRotZ"), 2),Double.NEGATIVE_INFINITY,drone.getEntityData().get(ROTZ)));
}
if (data.getDouble("droneRotX") > drone.getEntityData().get(ROT_X)) {
data.putDouble("droneRotX", Mth.clamp(data.getDouble("droneRotX") - 0.2 * Math.pow(drone.getEntityData().get(ROT_X) - data.getDouble("droneRotX"), 2),drone.getEntityData().get(ROT_X),Double.POSITIVE_INFINITY));
if (data.getDouble("droneRotX") > drone.getEntityData().get(ROTX)) {
data.putDouble("droneRotX", Mth.clamp(data.getDouble("droneRotX") - 0.2 * Math.pow(drone.getEntityData().get(ROTX) - data.getDouble("droneRotX"), 2),drone.getEntityData().get(ROTX),Double.POSITIVE_INFINITY));
} else {
data.putDouble("droneRotX", Mth.clamp(data.getDouble("droneRotX") + 0.2 * Math.pow(drone.getEntityData().get(ROT_X) - data.getDouble("droneRotX"), 2),Double.NEGATIVE_INFINITY,drone.getEntityData().get(ROT_X)));
data.putDouble("droneRotX", Mth.clamp(data.getDouble("droneRotX") + 0.2 * Math.pow(drone.getEntityData().get(ROTX) - data.getDouble("droneRotX"), 2),Double.NEGATIVE_INFINITY,drone.getEntityData().get(ROTX)));
}
event.setPitch((float) (pitch + data.getDouble("droneCameraRotX") - 0.15f * Mth.RAD_TO_DEG * data.getDouble("droneRotZ")));
@ -312,7 +312,7 @@ public class ClientEventHandler {
float times = 110f / fps;
var data = entity.getPersistentData();
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
if (data.getDouble("zoom_time") < 1) {
data.putDouble("zoom_time",
(data.getDouble("zoom_time") + entity.getMainHandItem().getOrCreateTag().getDouble("zoom_speed") * 0.03 * times));
@ -348,8 +348,8 @@ public class ClientEventHandler {
* stack.getOrCreateTag().getDouble("recoil_x");
var data = entity.getPersistentData();
var capability = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null);
if (capability.orElse(new TargetModVariables.PlayerVariables()).firing > 0) {
var capability = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null);
if (capability.orElse(new ModVariables.PlayerVariables()).firing > 0) {
data.putDouble("firetime", 0.001);
data.putDouble("fire_rotx_time", 0.001);
data.putDouble("firepos2", 0.1);
@ -377,11 +377,11 @@ public class ClientEventHandler {
if (0 < data.getDouble("fire_rotx_time") && data.getDouble("fire_rotx_time") < 1.732) {
data.putDouble("fire_rot",
(1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)));
if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) {
if ((capability.orElse(new ModVariables.PlayerVariables())).recoilHorizon > 0) {
event.setYaw((float) (yaw - 1.3 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)) + 1 * Mth.clamp(0.3 - data.getDouble("fire_rotx_time"), 0, 1) * (2 * Math.random() - 1)));
event.setPitch((float) (pitch + 1.3 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)) + 1 * Mth.clamp(0.3 - data.getDouble("fire_rotx_time"), 0, 1) * (2 * Math.random() - 1)));
event.setRoll((float) (roll + 4.2 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)) + 3 * Mth.clamp(0.5 - data.getDouble("fire_rotx_time"), 0, 0.5) * (2 * Math.random() - 1)));
} else if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon <= 0) {
} else if ((capability.orElse(new ModVariables.PlayerVariables())).recoilHorizon <= 0) {
event.setYaw((float) (yaw + 1.3 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)) + 1 * Mth.clamp(0.3 - data.getDouble("fire_rotx_time"), 0, 1) * (2 * Math.random() - 1)));
event.setPitch((float) (pitch - 1.3 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)) + 1 * Mth.clamp(0.3 - data.getDouble("fire_rotx_time"), 0, 1) * (2 * Math.random() - 1)));
event.setRoll((float) (roll - 4.2 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time"), 2)) + 3 * Mth.clamp(0.5 - data.getDouble("fire_rotx_time"), 0, 0.5) * (2 * Math.random() - 1)));
@ -434,7 +434,7 @@ public class ClientEventHandler {
float times = 90f / fps;
CompoundTag persistentData = entity.getPersistentData();
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).bowPull) {
if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).bowPull) {
persistentData.putDouble("pulltime", Math.min(persistentData.getDouble("pulltime") + 0.018 * times, 1));
persistentData.putDouble("bowtime", Math.min(persistentData.getDouble("bowtime") + 0.018 * times, 1));
persistentData.putDouble("handtime", Math.min(persistentData.getDouble("handtime") + 0.018 * times, 1));
@ -474,7 +474,7 @@ public class ClientEventHandler {
return;
}
if (player.isPassenger() && player.getVehicle() instanceof Mk42Entity) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
event.setFOV(event.getFOV() / 5);
}
}

24
src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.event;
import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.entity.ProjectileEntity;
import net.mcreator.superbwarfare.init.*;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.network.message.ZoomMessage;
import net.mcreator.superbwarfare.tools.GunInfo;
import net.mcreator.superbwarfare.tools.GunsTool;
@ -146,7 +146,7 @@ public class GunEventHandler {
int zoom_add_cooldown = 0;
if (stack.getItem() == ModItems.MARLIN.get()) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
zoom_add_cooldown = 5;
stack.getOrCreateTag().putDouble("marlin_animation_time", 15);
stack.getOrCreateTag().putBoolean("fastfiring", false);
@ -195,7 +195,7 @@ public class GunEventHandler {
var tag = stack.getOrCreateTag();
if ((player.getPersistentData().getBoolean("firing") || (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) && !player.isSprinting()) {
if ((player.getPersistentData().getBoolean("firing") || (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) && !player.isSprinting()) {
if (tag.getDouble("minigun_rotation") < 10) {
tag.putDouble("minigun_rotation", (tag.getDouble("minigun_rotation") + 1));
}
@ -207,7 +207,7 @@ public class GunEventHandler {
}
if (tag.getDouble("overheat") == 0
&& (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
&& (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).rifleAmmo > 0
&& !(player.getCooldowns().isOnCooldown(stack.getItem())) && tag.getDouble("minigun_rotation") >= 10 && player.getPersistentData().getBoolean("firing")) {
tag.putDouble("heat", (tag.getDouble("heat") + 0.5));
if (tag.getDouble("heat") >= 50.5) {
@ -240,8 +240,8 @@ public class GunEventHandler {
gunShoot(player);
}
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.rifleAmmo = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()).rifleAmmo - 1;
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.rifleAmmo = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).rifleAmmo - 1;
capability.syncPlayerVariables(player);
});
@ -571,7 +571,7 @@ public class GunEventHandler {
if ((tag.getDouble("prepare") == 1 || tag.getDouble("prepare_load") == 1)) {
//检查备弹
var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables());
var capability = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables());
if (stack.is(ModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) {
tag.putBoolean("force_stage3_start", true);
} else if (stack.is(ModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) {
@ -632,7 +632,7 @@ public class GunEventHandler {
}
//备弹耗尽结束
var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables());
var capability = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables());
if (stack.is(ModTags.Items.SHOTGUN) && capability.shotgunAmmo == 0) {
tag.putInt("reload_stage", 3);
} else if (stack.is(ModTags.Items.SNIPER_RIFLE) && capability.sniperAmmo == 0) {
@ -675,22 +675,22 @@ public class GunEventHandler {
tag.putInt("ammo", tag.getInt("ammo") + 1);
if (stack.is(ModTags.Items.SHOTGUN)) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.shotgunAmmo = capability.shotgunAmmo - 1;
capability.syncPlayerVariables(player);
});
} else if (stack.is(ModTags.Items.SNIPER_RIFLE)) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.sniperAmmo = capability.sniperAmmo - 1;
capability.syncPlayerVariables(player);
});
} else if ((stack.is(ModTags.Items.HANDGUN) || stack.is(ModTags.Items.SMG))) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.handgunAmmo = capability.handgunAmmo - 1;
capability.syncPlayerVariables(player);
});
} else if (stack.is(ModTags.Items.RIFLE)) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.rifleAmmo = capability.rifleAmmo - 1;
capability.syncPlayerVariables(player);
});

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

@ -7,7 +7,7 @@ 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.ModVariables;
import net.mcreator.superbwarfare.network.message.ClientIndicatorMessage;
import net.mcreator.superbwarfare.network.message.PlayerGunKillMessage;
import net.mcreator.superbwarfare.tools.SoundTool;
@ -226,7 +226,7 @@ public class LivingEventHandler {
LivingEntity entity = event.getEntity();
DamageSource source = event.getSource();
if (!TargetModVariables.MapVariables.get(entity.level()).pvpMode) {
if (!ModVariables.MapVariables.get(entity.level()).pvpMode) {
return;
}

133
src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java
View file

@ -4,7 +4,7 @@ import net.mcreator.superbwarfare.ModUtils;
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.ModVariables;
import net.mcreator.superbwarfare.network.message.SimulationDistanceMessage;
import net.mcreator.superbwarfare.tools.SoundTool;
import net.minecraft.core.BlockPos;
@ -14,6 +14,8 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
@ -26,6 +28,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.network.PacketDistributor;
import java.text.DecimalFormat;
@Mod.EventBusSubscriber
public class PlayerEventHandler {
@ -48,7 +52,7 @@ public class PlayerEventHandler {
return;
}
if (!TargetModVariables.MapVariables.get(player.level()).pvpMode) {
if (!ModVariables.MapVariables.get(player.level()).pvpMode) {
return;
}
@ -58,7 +62,7 @@ public class PlayerEventHandler {
}
}
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.zoom = false;
capability.zooming = false;
capability.syncPlayerVariables(player);
@ -88,22 +92,83 @@ public class PlayerEventHandler {
handleBocekPulling(player);
handleGunRecoil(player);
}
handleDistantRange(player);
handleSimulationDistance(player);
handleCannonTime(player);
handleTacticalSprint(player);
}
}
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).cannonFiring > 0) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.cannonFiring = (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).cannonFiring - 1;
private static void handleTacticalSprint(Player player) {
ItemStack stack = player.getMainHandItem();
int sprint_cost;
if (stack.is(ModTags.Items.GUN)) {
double weight = stack.getOrCreateTag().getDouble("weight");
if (weight == 0) {
sprint_cost = 4;
} else if (weight == 1) {
sprint_cost = 6;
} else if (weight == 2) {
sprint_cost = 8;
} else {
sprint_cost = 3;
}
} else {
sprint_cost = 3;
}
if (!player.isSprinting()) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprint = false;
capability.syncPlayerVariables(player);
});
}
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).cannonRecoil > 0) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.cannonRecoil = (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).cannonRecoil - 1;
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).tacticalSprint) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprintTime = Mth.clamp(player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).tacticalSprintTime - sprint_cost,0,600);
capability.syncPlayerVariables(player);
});
player.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 2, 1, false, false));
} else {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprintTime = Mth.clamp(player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).tacticalSprintTime + 5,0,600);
capability.syncPlayerVariables(player);
});
}
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).tacticalSprintTime == 0) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprintExhaustion = true;
capability.tacticalSprint = false;
capability.syncPlayerVariables(player);
});
}
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).tacticalSprintTime == 600) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprintExhaustion = false;
capability.syncPlayerVariables(player);
});
}
}
private static void handleCannonTime(Player player) {
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).cannonFiring > 0) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.cannonFiring = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).cannonFiring - 1;
capability.syncPlayerVariables(player);
});
}
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).cannonRecoil > 0) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.cannonRecoil = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).cannonRecoil - 1;
capability.syncPlayerVariables(player);
});
}
}
@ -126,9 +191,9 @@ public class PlayerEventHandler {
player.getPersistentData().putDouble("prone", (player.getPersistentData().getDouble("prone") - 1));
}
boolean flag = !(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).refresh;
boolean flag = !(player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).refresh;
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.refresh = flag;
capability.syncPlayerVariables(player);
});
@ -142,7 +207,7 @@ public class PlayerEventHandler {
player.getPersistentData().putDouble("noRun", 20);
}
if (player.isShiftKeyDown() || player.isPassenger() || player.isInWater() || (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if (player.isShiftKeyDown() || player.isPassenger() || player.isInWater() || (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
player.getPersistentData().putDouble("noRun", 1);
}
@ -150,7 +215,7 @@ public class PlayerEventHandler {
player.getPersistentData().putDouble("noRun", (player.getPersistentData().getDouble("noRun") - 1));
}
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
player.setSprinting(false);
}
}
@ -181,25 +246,25 @@ public class PlayerEventHandler {
if (stack.is(ModTags.Items.RIFLE)) {
stack.getOrCreateTag().putInt("max_ammo",
((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo));
((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).rifleAmmo));
}
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));
((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).handgunAmmo));
}
if (stack.is(ModTags.Items.SHOTGUN)) {
stack.getOrCreateTag().putInt("max_ammo",
((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo));
((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).shotgunAmmo));
}
if (stack.is(ModTags.Items.SNIPER_RIFLE)) {
stack.getOrCreateTag().putInt("max_ammo",
((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo));
((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).sniperAmmo));
}
}
private static void handleGround(Player player) {
if (player.onGround()) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.playerDoubleJump = false;
capability.syncPlayerVariables(player);
});
@ -215,9 +280,9 @@ public class PlayerEventHandler {
&& !stack.getOrCreateTag().getBoolean("charging")
&& !stack.getOrCreateTag().getBoolean("reloading")) {
if (player.getMainHandItem().getItem() != ModItems.MINIGUN.get()) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
player.setSprinting(false);
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.zooming = true;
capability.syncPlayerVariables(player);
});
@ -256,7 +321,7 @@ public class PlayerEventHandler {
new ClipContext(player.getEyePosition(), player.getEyePosition().add(player.getLookAngle().scale(1024)),
ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))) <= 512) {
if (!player.level().isClientSide())
player.displayClientMessage(Component.literal((new java.text.DecimalFormat("##.#")
player.displayClientMessage(Component.literal((new DecimalFormat("##.#")
.format(player.position().distanceTo((Vec3.atLowerCornerOf(
player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(player.getLookAngle().scale(768)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))))
+ "M")), true);
@ -271,7 +336,7 @@ public class PlayerEventHandler {
ItemStack mainHandItem = player.getMainHandItem();
CompoundTag tag = mainHandItem.getOrCreateTag();
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).bowPullHold) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).bowPullHold) {
if (mainHandItem.getItem() == ModItems.BOCEK.get()
&& tag.getInt("max_ammo") > 0
&& !player.getCooldowns().isOnCooldown(mainHandItem.getItem())
@ -279,7 +344,7 @@ public class PlayerEventHandler {
) {
tag.putDouble("power", tag.getDouble("power") + 1);
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.bowPull = true;
capability.syncPlayerVariables(player);
});
@ -294,7 +359,7 @@ public class PlayerEventHandler {
if (mainHandItem.getItem() == ModItems.BOCEK.get()) {
tag.putDouble("power", 0);
}
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.bowPull = false;
capability.syncPlayerVariables(player);
});
@ -308,10 +373,10 @@ public class PlayerEventHandler {
float recoilX = (float) tag.getDouble("recoil_x");
float recoilY = (float) tag.getDouble("recoil_y");
float recoilYaw = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoilHorizon).orElse(0d).floatValue();
float recoilYaw = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoilHorizon).orElse(0d).floatValue();
if (tag.getBoolean("shoot")) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.recoilHorizon = 2 * Math.random() - 1;
capability.recoil = 0.1;
capability.firing = 1;
@ -329,7 +394,7 @@ public class PlayerEventHandler {
while (recoilTimer[0] < recoilDuration) {
if (tag.getBoolean("shoot")) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.recoilHorizon = 2 * Math.random() - 1;
capability.recoil = 0.1;
capability.firing = 1;
@ -341,13 +406,13 @@ public class PlayerEventHandler {
/*
开火动画计时器
*/
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing > 0) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing - 0.1;
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).firing > 0) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).firing - 0.1;
capability.syncPlayerVariables(player);
});
} else {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = 0;
capability.syncPlayerVariables(player);
});
@ -373,7 +438,7 @@ public class PlayerEventHandler {
ry = 1f;
}
double recoil = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoil).orElse(0d);
double recoil = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoil).orElse(0d);
if (recoil >= 2.5) recoil = 0d;
@ -400,7 +465,7 @@ public class PlayerEventHandler {
}
double finalRecoil = recoil;
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(c -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(c -> {
c.recoil = finalRecoil;
c.syncPlayerVariables(player);
});

19
src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
View file

@ -194,12 +194,29 @@ public class ModKeyMappings {
isDownOld = isDown;
}
};
public static final KeyMapping TACTICAL_SPRINT = new KeyMapping("key.superbwarfare.tactical_sprint", GLFW.GLFW_KEY_LEFT_CONTROL, "key.categories.superbwarfare") {
private boolean isDownOld = false;
@Override
public void setDown(boolean isDown) {
super.setDown(isDown);
if (isDownOld != isDown && isDown) {
ModUtils.PACKET_HANDLER.sendToServer(new TacticalSprintMessage(true));
TACTICAL_SPRINT_LASTPRESS = System.currentTimeMillis();
} else if (isDownOld != isDown) {
int dt = (int) (System.currentTimeMillis() - TACTICAL_SPRINT_LASTPRESS);
ModUtils.PACKET_HANDLER.sendToServer(new TacticalSprintMessage(false));
}
isDownOld = isDown;
}
};
private static long FORWARD_LASTPRESS = 0;
private static long BACKWARD_LASTPRESS = 0;
private static long LEFT_LASTPRESS = 0;
private static long RIGHT_LASTPRESS = 0;
private static long UP_LASTPRESS = 0;
private static long DOWN_LASTPRESS = 0;
private static long TACTICAL_SPRINT_LASTPRESS = 0;
@ -217,6 +234,7 @@ public class ModKeyMappings {
event.register(RIGHT);
event.register(UP);
event.register(DOWN);
event.register(TACTICAL_SPRINT);
}
@ -237,6 +255,7 @@ public class ModKeyMappings {
RIGHT.consumeClick();
UP.consumeClick();
DOWN.consumeClick();
TACTICAL_SPRINT.consumeClick();
}
}
}

13
src/main/java/net/mcreator/superbwarfare/item/MortarBarrel.java
View file

@ -1,10 +1,21 @@
package net.mcreator.superbwarfare.item;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import java.util.List;
public class MortarBarrel extends Item {
public MortarBarrel() {
super(new Item.Properties().fireResistant());
super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.COMMON));
}
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
}

1
src/main/java/net/mcreator/superbwarfare/item/MortarBasePlate.java
View file

@ -6,4 +6,5 @@ public class MortarBasePlate extends Item {
public MortarBasePlate() {
super(new Item.Properties());
}
}

4
src/main/java/net/mcreator/superbwarfare/item/common/ammo/AmmoSupplierItem.java
View file

@ -1,7 +1,7 @@
package net.mcreator.superbwarfare.item.common.ammo;
import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.GunInfo;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundSource;
@ -30,7 +30,7 @@ public abstract class AmmoSupplierItem extends Item {
player.getCooldowns().addCooldown(this, 10);
stack.shrink(count);
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
var newAmmoCount = switch (this.type) {
case HANDGUN -> capability.handgunAmmo;
case RIFLE -> capability.rifleAmmo;

4
src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java
View file

@ -1,7 +1,7 @@
package net.mcreator.superbwarfare.item.common.ammo;
import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundSource;
@ -47,7 +47,7 @@ public class CreativeAmmoBox extends Item {
player.getCooldowns().addCooldown(this, 20);
stack.shrink(1);
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.handgunAmmo = 2147483647;
capability.rifleAmmo = 2147483647;
capability.shotgunAmmo = 2147483647;

5
src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -108,8 +109,12 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -107,8 +108,12 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -101,8 +102,12 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java
View file

@ -18,6 +18,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
@ -83,8 +84,12 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.run"));
}
}
if (this.animationProcedure.equals("empty")) {
event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.bocek.idle"));

5
src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -96,8 +97,12 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.idle"));
}

4
src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.item.gun;
import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.EnchantmentCategoryTool;
import net.mcreator.superbwarfare.tools.GunsTool;
import net.mcreator.superbwarfare.tools.ItemNBTTool;
@ -57,7 +57,7 @@ public abstract class GunItem extends Item {
if (itemstack.getOrCreateTag().getBoolean("draw")) {
itemstack.getOrCreateTag().putBoolean("draw", false);
itemstack.getOrCreateTag().putInt("draw_time", 0);
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.zooming = false;
capability.syncPlayerVariables(entity);
});

5
src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -103,8 +104,12 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -96,8 +97,12 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.idle"));
}
return PlayState.STOP;

5
src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -103,8 +104,12 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -107,8 +108,12 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java
View file

@ -18,6 +18,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
@ -99,8 +100,12 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java
View file

@ -18,6 +18,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -110,8 +111,12 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run"));
}
}
event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.m870.idle"));
return PlayState.CONTINUE;

5
src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -99,8 +100,12 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java
View file

@ -18,6 +18,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
@ -118,8 +119,12 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run"));
}
}
event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.marlin.idle"));
return PlayState.CONTINUE;

5
src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java
View file

@ -19,6 +19,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.HumanoidArm;
@ -121,8 +122,12 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.idle"));
}
return PlayState.STOP;

6
src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java
View file

@ -17,6 +17,8 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -103,8 +105,12 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.idle"));
}

9
src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java
View file

@ -8,7 +8,7 @@ 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.network.ModVariables;
import net.mcreator.superbwarfare.tools.GunsTool;
import net.mcreator.superbwarfare.tools.RarityTool;
import net.mcreator.superbwarfare.tools.TooltipTool;
@ -20,6 +20,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -93,7 +94,7 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift2"));
}
@ -133,8 +134,12 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem {
if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java
View file

@ -18,6 +18,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
@ -94,8 +95,12 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -103,8 +104,12 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle"));
}

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

@ -9,7 +9,7 @@ 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.network.ModVariables;
import net.mcreator.superbwarfare.tools.GunsTool;
import net.mcreator.superbwarfare.tools.RarityTool;
import net.mcreator.superbwarfare.tools.TooltipTool;
@ -128,7 +128,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.shift2"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -100,8 +101,12 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java
View file

@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -95,8 +96,12 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java
View file

@ -19,6 +19,7 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
@ -119,8 +120,12 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java
View file

@ -19,6 +19,7 @@ import net.minecraft.network.chat.Style;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -102,8 +103,12 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.idle"));
}

5
src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java
View file

@ -18,6 +18,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -107,8 +108,12 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.idle"));
}

6
src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.mixins;
import net.mcreator.superbwarfare.entity.Mk42Entity;
import net.mcreator.superbwarfare.init.ModMobEffects;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.client.CameraType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.MouseHandler;
@ -38,7 +38,7 @@ public class MouseHandlerMixin {
ItemStack stack = mc.player.getMainHandItem();
if (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
return 0.12;
} else {
return 0.23;
@ -57,7 +57,7 @@ public class MouseHandlerMixin {
float originalFov = mc.options.fov().get();
if (!player.getMainHandItem().isEmpty() && mc.options.getCameraType() == CameraType.FIRST_PERSON) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
additionalAdsSensitivity = (float) Mth.clamp((1 + 0.1f * customSens) * (1.25F * fov / originalFov) * (1 + 0.2f * Math.pow((originalFov / fov), 1.25)), 0.125F, 2F);
} else {
additionalAdsSensitivity = Mth.clamp((1 + 0.1f * customSens) * 1.25F, 0.125F, 2F);

18
src/main/java/net/mcreator/superbwarfare/network/TargetModVariables.java → src/main/java/net/mcreator/superbwarfare/network/ModVariables.java
View file

@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.function.Supplier;
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
public class TargetModVariables {
public class ModVariables {
@SubscribeEvent
public static void init(FMLCommonSetupEvent event) {
ModUtils.addNetworkMessage(SavedDataSyncMessage.class, SavedDataSyncMessage::buffer, SavedDataSyncMessage::new, SavedDataSyncMessage::handler);
@ -91,6 +91,9 @@ public class TargetModVariables {
clone.bowPullHold = original.bowPullHold;
clone.bowPull = original.bowPull;
clone.playerDoubleJump = original.playerDoubleJump;
clone.tacticalSprint = original.tacticalSprint;
clone.tacticalSprintTime = original.tacticalSprintTime;
clone.tacticalSprintExhaustion = original.tacticalSprintExhaustion;
if (event.getEntity().level().isClientSide()) return;
@ -280,6 +283,10 @@ public class TargetModVariables {
public boolean bowPullHold = false;
public boolean bowPull = false;
public boolean playerDoubleJump = false;
public boolean tacticalSprint = false;
public int tacticalSprintTime = 600;
public boolean tacticalSprintExhaustion = false;
public void syncPlayerVariables(Entity entity) {
if (entity instanceof ServerPlayer)
@ -304,6 +311,9 @@ public class TargetModVariables {
nbt.putBoolean("bow_pull_hold", bowPullHold);
nbt.putBoolean("bow_pull", bowPull);
nbt.putBoolean("player_double_jump", playerDoubleJump);
nbt.putBoolean("tacticalSprint", tacticalSprint);
nbt.putInt("tacticalSprintTime", tacticalSprintTime);
nbt.putBoolean("tacticalSprintExhaustion", tacticalSprintExhaustion);
return nbt;
}
@ -326,6 +336,9 @@ public class TargetModVariables {
bowPullHold = nbt.getBoolean("bow_pull_hold");
bowPull = nbt.getBoolean("bow_pull");
playerDoubleJump = nbt.getBoolean("player_double_jump");
tacticalSprint = nbt.getBoolean("tacticalSprint");
tacticalSprintTime = nbt.getInt("tacticalSprintTime");
tacticalSprintExhaustion = nbt.getBoolean("tacticalSprintExhaustion");
}
}
@ -384,6 +397,9 @@ public class TargetModVariables {
variables.bowPullHold = message.data.bowPullHold;
variables.bowPull = message.data.bowPull;
variables.playerDoubleJump = message.data.playerDoubleJump;
variables.tacticalSprint = message.data.tacticalSprint;
variables.tacticalSprintTime = message.data.tacticalSprintTime;
variables.tacticalSprintExhaustion = message.data.tacticalSprintExhaustion;
});
}
}

6
src/main/java/net/mcreator/superbwarfare/network/message/DoubleJumpMessage.java
View file

@ -1,7 +1,7 @@
package net.mcreator.superbwarfare.network.message;
import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.core.BlockPos;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.sounds.SoundSource;
@ -48,14 +48,14 @@ public class DoubleJumpMessage {
}
if (type == 0) {
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).playerDoubleJump) {
if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.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), ModSounds.DOUBLE_JUMP.get(), SoundSource.BLOCKS, 1, 1);
} else {
level.playLocalSound(x, y, z, ModSounds.DOUBLE_JUMP.get(), SoundSource.BLOCKS, 1, 1, false);
}
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.playerDoubleJump = false;
capability.syncPlayerVariables(entity);
});

12
src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.network.message;
import net.mcreator.superbwarfare.entity.*;
import net.mcreator.superbwarfare.event.GunEventHandler;
import net.mcreator.superbwarfare.init.*;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.ItemNBTTool;
import net.mcreator.superbwarfare.tools.SoundTool;
import net.minecraft.commands.CommandSource;
@ -60,7 +60,7 @@ public class FireMessage {
} else if (type == 1) {
player.getPersistentData().putBoolean("firing", false);
player.getPersistentData().putDouble("minigun_firing", 0);
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.bowPullHold = false;
capability.syncPlayerVariables(player);
});
@ -113,14 +113,14 @@ public class FireMessage {
}
if (handItem.getItem() == ModItems.MINIGUN.get()) {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo == 0) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).rifleAmmo == 0) {
if (!player.level().isClientSide()) {
SoundTool.playLocalSound(player, ModSounds.TRIGGER_CLICK.get(), 10, 1);
}
}
}
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.bowPullHold = true;
capability.syncPlayerVariables(player);
});
@ -146,7 +146,7 @@ public class FireMessage {
if (stack.getOrCreateTag().getDouble("power") >= 6) {
stack.getOrCreateTag().putDouble("speed", stack.getOrCreateTag().getDouble("power"));
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) {
Level level = player.level();
if (!level.isClientSide()) {
int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.MONSTER_HUNTER.get(), stack);
@ -181,7 +181,7 @@ public class FireMessage {
}
}
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.recoil = 0.1;
capability.firing = 1;
capability.syncPlayerVariables(player);

4
src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java
View file

@ -3,7 +3,7 @@ package net.mcreator.superbwarfare.network.message;
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.ModVariables;
import net.minecraft.core.Holder;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
@ -97,7 +97,7 @@ public class FireModeMessage {
}
}
var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables());
var capability = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables());
if (mainHandItem.getItem() == ModItems.SENTINEL.get()
&& !player.isSpectator()

4
src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java
View file

@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.network.message;
import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Player;
@ -44,7 +44,7 @@ public class ReloadMessage {
return;
if (type == 0) {
ItemStack stack = player.getMainHandItem();
var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables());
var capability = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables());
if (!player.isSpectator()
&& stack.is(ModTags.Items.GUN)

52
src/main/java/net/mcreator/superbwarfare/network/message/TacticalSprintMessage.java Normal file
View file

@ -0,0 +1,52 @@
package net.mcreator.superbwarfare.network.message;
import net.mcreator.superbwarfare.entity.DroneEntity;
import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.ModVariables;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.network.NetworkEvent;
import software.bernie.geckolib.animatable.GeoItem;
import java.util.function.Supplier;
public class TacticalSprintMessage {
private final boolean sprint;
public TacticalSprintMessage(boolean sprint) {
this.sprint = sprint;
}
public static TacticalSprintMessage decode(FriendlyByteBuf buffer) {
return new TacticalSprintMessage(buffer.readBoolean());
}
public static void encode(TacticalSprintMessage message, FriendlyByteBuf buffer) {
buffer.writeBoolean(message.sprint);
}
public static void handler(TacticalSprintMessage message, Supplier<NetworkEvent.Context> contextSupplier) {
NetworkEvent.Context context = contextSupplier.get();
context.enqueueWork(() -> {
if (context.getSender() != null) {
Player player = context.getSender();
if (message.sprint) {
player.setSprinting(true);
if (!(player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).tacticalSprintExhaustion) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprint = true;
capability.syncPlayerVariables(player);
});
}
}
}
});
context.setPacketHandled(true);
}
}

8
src/main/java/net/mcreator/superbwarfare/network/message/ZoomMessage.java
View file

@ -4,7 +4,7 @@ import net.mcreator.superbwarfare.entity.Mk42Entity;
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.ModVariables;
import net.mcreator.superbwarfare.tools.SoundTool;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer;
@ -50,7 +50,7 @@ public class ZoomMessage {
}
if (type == 0) {
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.zoom = true;
capability.syncPlayerVariables(entity);
});
@ -74,11 +74,11 @@ public class ZoomMessage {
}
}
if (type == 1) {
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.zoom = false;
capability.syncPlayerVariables(entity);
});
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.zooming = false;
capability.syncPlayerVariables(entity);
});

8
src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java
View file

@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.tools;
import com.google.gson.stream.JsonReader;
import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.network.TargetModVariables;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.network.message.GunsDataMessage;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerPlayer;
@ -65,7 +65,7 @@ public class GunsTool {
}
public static void pvpModeCheck(ItemStack stack, Level level) {
if (!TargetModVariables.MapVariables.get(level).pvpMode) {
if (!ModVariables.MapVariables.get(level).pvpMode) {
if (stack.getOrCreateTag().getInt("level") >= 10) {
stack.getOrCreateTag().putDouble("damageadd", 1 + 0.05 * (stack.getOrCreateTag().getInt("level") - 10));
} else {
@ -112,14 +112,14 @@ public class GunsTool {
tag.putDouble("need_bolt_action", 0);
}
int playerAmmo = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> switch (type) {
int playerAmmo = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> switch (type) {
case RIFLE -> c.rifleAmmo;
case HANDGUN -> c.handgunAmmo;
case SHOTGUN -> c.shotgunAmmo;
case SNIPER -> c.sniperAmmo;
}).orElse(0);
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
var newAmmoCount = Math.max(0, playerAmmo - ammoToAdd);
switch (type) {
case RIFLE -> capability.rifleAmmo = newAmmoCount;

128
src/main/resources/assets/superbwarfare/animations/aa12.animation.json
View file

@ -1,17 +1,6 @@
{
"format_version": "1.8.0",
"animations": {
"animation.aa12.idle": {
"loop": true,
"animation_length": 0.25,
"bones": {
"0": {
"rotation": {
"vector": [0, 0, 0]
}
}
}
},
"animation.aa12.draw": {
"animation_length": 1,
"bones": {
@ -92,6 +81,17 @@
}
}
},
"animation.aa12.idle": {
"loop": true,
"animation_length": 0.25,
"bones": {
"0": {
"rotation": {
"vector": [0, 0, 0]
}
}
}
},
"animation.aa12.changefirerate": {
"animation_length": 0.5,
"bones": {
@ -202,25 +202,121 @@
},
"position": {
"0.0": {
"vector": [5.5, -3, 0]
"vector": [5.5, -2, 0]
},
"0.2083": {
"vector": [2.75, -2.5, 0],
"vector": [2.75, -1.5, 0],
"easing": "easeInSine"
},
"0.4167": {
"vector": [0.5, -3, 0],
"vector": [0.5, -2, 0],
"easing": "easeOutSine"
},
"0.5833": {
"vector": [2.75, -2.5, 0],
"vector": [2.75, -1.5, 0],
"easing": "easeInSine"
},
"0.7917": {
"vector": [5.5, -3, 0],
"vector": [5.5, -2, 0],
"easing": "easeOutSine"
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2083": {
"vector": [0.3, 0, -0.3]
},
"0.4167": {
"vector": [-0.3, 0.3, 0.3]
},
"0.5833": {
"vector": [0.3, 0, -0.3]
},
"0.7917": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.aa12.run_fast": {
"loop": true,
"animation_length": 0.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-44.22375, 21.2133, 4.79361]
},
"0.2": {
"vector": [-40.88804, 21.40026, 11.0472],
"easing": "easeInSine"
},
"0.4": {
"vector": [-48.58194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-52.13904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.8": {
"vector": [-44.22375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-5.29989, -0.71669, 0.66806],
"easing": "easeOutSine"
},
"0.2": {
"vector": [-6.5, 2, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [-7.3406, -0.71261, 0.68321],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-6.5, 2, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [-5.29989, -0.71669, 0.66806],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},

99
src/main/resources/assets/superbwarfare/animations/abekiri.animation.json
View file

@ -62,21 +62,96 @@
"0": {
"rotation": {
"0.0": {
"vector": [-65.9038, -15.62275, -2.04194]
"vector": [4.74287, -58.94632, 9.89514]
},
"0.2": {
"vector": [-65.0874, -15.34602, 3.85087],
"vector": [-8.55104, -59.60571, 19.61648],
"easing": "easeInSine"
},
"0.4": {
"vector": [-65.9038, -15.62275, -2.04194],
"vector": [-8.58141, -58.99717, 19.60323],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-66.96649, -15.83614, -7.74173],
"vector": [-0.82277, -58.8651, 9.93666],
"easing": "easeInSine"
},
"0.8": {
"vector": [4.74287, -58.94632, 9.89514]
}
},
"position": {
"0.0": {
"vector": [5.5, -4, 0]
},
"0.2": {
"vector": [3.75, -3.5, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -4, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [4.25, -3.5, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [5.5, -4, 0]
}
}
},
"Righthand": {
"rotation": {
"vector": [0, 12.5, 0]
},
"position": {
"vector": [1.69838, 0, -0.07415]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.ab.run_fast": {
"loop": true,
"animation_length": 0.6,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-65.9038, -15.62275, -2.04194]
},
"0.15": {
"vector": [-65.0874, -15.34602, 3.85087],
"easing": "easeInSine"
},
"0.3": {
"vector": [-65.9038, -15.62275, -2.04194],
"easing": "easeOutSine"
},
"0.45": {
"vector": [-66.96649, -15.83614, -7.74173],
"easing": "easeInSine"
},
"0.6": {
"vector": [-65.9038, -15.62275, -2.04194],
"easing": "easeOutSine"
}
@ -86,19 +161,19 @@
"vector": [-5.5, 6, -2],
"easing": "easeOutSine"
},
"0.2": {
"0.15": {
"vector": [-6.5, 8, -2],
"easing": "easeInSine"
},
"0.4": {
"0.3": {
"vector": [-7.5, 6, -2],
"easing": "easeOutSine"
},
"0.6": {
"0.45": {
"vector": [-6.5, 8, -2],
"easing": "easeInSine"
},
"0.8": {
"0.6": {
"vector": [-5.5, 6, -2],
"easing": "easeOutSine"
}
@ -122,16 +197,16 @@
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"0.15": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"0.3": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"0.45": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"0.6": {
"vector": [-0.3, -0.3, 0.3]
}
}

116
src/main/resources/assets/superbwarfare/animations/ak.animation.json
View file

@ -247,50 +247,68 @@
}
},
"animation.ak47.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-14.82442, -57.81517, 38.62375]
"vector": [-19.82442, -57.81517, 38.62375]
},
"0.2": {
"vector": [-16.82442, -57.81517, 38.62375],
"vector": [-21.82442, -57.81517, 38.62375],
"easing": "easeInSine"
},
"0.4": {
"vector": [-14.82442, -57.81517, 38.62375],
"vector": [-19.82442, -57.81517, 38.62375],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-12.82442, -57.81517, 38.62375],
"vector": [-17.82442, -57.81517, 38.62375],
"easing": "easeInSine"
},
"0.8": {
"vector": [-14.82442, -57.81517, 38.62375]
"vector": [-19.82442, -57.81517, 38.62375],
"easing": "easeOutSine"
}
},
"position": {
"0.0": {
"vector": [2.5, -2, 0]
"vector": [3.5, -1.75, 0]
},
"0.2": {
"vector": [0.75, -1.5, 0],
"vector": [2.25, -1.25, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [-0.5, -2, 0],
"vector": [1, -1.75, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [0.75, -1.5, 0],
"vector": [2, -1.25, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [2.5, -2, 0]
"vector": [3.5, -1.75, 0]
}
}
},
"Lefthand": {
"rotation": {
"vector": [-27.6003, -27.56966, -16.00843]
},
"position": {
"vector": [-0.6, -2.7, -3.3]
}
},
"Righthand": {
"rotation": {
"vector": [0, 20, 0]
},
"position": {
"vector": [3.55421, -0.38623, -0.42238]
}
},
"camera": {
"rotation": {
"0.0": {
@ -309,13 +327,87 @@
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.ak47.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-71.5441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-70.25009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.08194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-72.13904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-71.72375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"magazine2": {
"scale": {
"vector": [0, 0, 0]
}
},
"Lefthand": {
"rotation": {
"vector": [-27.6003, -27.56966, -16.00843]
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [-0.6, -2.7, -3.3]
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}

102
src/main/resources/assets/superbwarfare/animations/bocek.animation.json
View file

@ -54,25 +54,6 @@
"loop": true,
"animation_length": 0.8333,
"bones": {
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2083": {
"vector": [0.3, 0, -0.3]
},
"0.4167": {
"vector": [-0.3, 0.3, 0.3]
},
"0.5833": {
"vector": [0.3, 0, -0.3]
},
"0.7917": {
"vector": [-0.3, -0.3, 0.3]
}
}
},
"anim": {
"rotation": {
"0.0": {
@ -111,6 +92,89 @@
"vector": [2.49619, -2.07196, 0.17365]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2083": {
"vector": [0.3, 0, -0.3]
},
"0.4167": {
"vector": [-0.3, 0.3, 0.3]
},
"0.5833": {
"vector": [0.3, 0, -0.3]
},
"0.7917": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.bocek.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"anim": {
"rotation": {
"0.0": {
"vector": [-17.24597, -28.12341, 15.3498]
},
"0.175": {
"vector": [-18.69703, -20.6475, 6.54519]
},
"0.35": {
"vector": [-11.13053, -13.31405, -12.81665]
},
"0.525": {
"vector": [-18.90638, -22.63801, -4.37758]
},
"0.7": {
"vector": [-17.24597, -28.12341, 15.3498]
}
},
"position": {
"0.0": {
"vector": [9.01918, 1.00725, 2.02529]
},
"0.175": {
"vector": [4.45879, 3.05461, 0.6762],
"easing": "easeInSine"
},
"0.35": {
"vector": [-0.89903, 2.10978, -0.3762],
"easing": "easeOutSine"
},
"0.525": {
"vector": [3.85879, 3.90156, 0.83854],
"easing": "easeInSine"
},
"0.7": {
"vector": [9.01918, 1.00725, 2.02529]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
}

108
src/main/resources/assets/superbwarfare/animations/devotion.animation.json
View file

@ -61,6 +61,9 @@
}
}
},
"animation.devotion.fire": {
"animation_length": 0.0404
},
"animation.devotion.run": {
"loop": true,
"animation_length": 0.8,
@ -68,44 +71,42 @@
"0": {
"rotation": {
"0.0": {
"vector": [-14.82442, -57.81517, 38.62375]
"vector": [-8.58141, -58.99717, 19.60323]
},
"0.2": {
"vector": [-16.82442, -57.81517, 38.62375],
"vector": [-16.89785, -58.93146, 29.32067],
"easing": "easeInSine"
},
"0.4": {
"vector": [-14.82442, -57.81517, 38.62375],
"vector": [-11.86592, -58.7588, 29.27447],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-12.82442, -57.81517, 38.62375],
"vector": [-4.1129, -58.86791, 19.61564],
"easing": "easeInSine"
},
"0.8": {
"vector": [-14.82442, -57.81517, 38.62375],
"easing": "easeOutSine"
"vector": [-8.58141, -58.99717, 19.60323]
}
},
"position": {
"0.0": {
"vector": [3.5, -2, 0]
"vector": [4, -2, 0.75]
},
"0.2": {
"vector": [2.75, -1.5, 0],
"vector": [1.75, -1.25, 0.75],
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -2, 0],
"vector": [0.25, -2, 0.75],
"easing": "easeOutSine"
},
"0.6": {
"vector": [2.75, -1.5, 0],
"vector": [2.25, -1.25, 0.75],
"easing": "easeInSine"
},
"0.8": {
"vector": [3.5, -2, 0],
"easing": "easeOutSine"
"vector": [4, -2, 0.75]
}
}
},
@ -130,8 +131,87 @@
}
}
},
"animation.devotion.fire": {
"animation_length": 0.0404
"animation.devotion.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-71.5441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-70.81031, 14.38777, 10.95347],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.6528, 13.72572, 4.64286],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-71.51765, 24.09022, 2.19363],
"easing": "easeInSine"
},
"0.7": {
"vector": [-71.72375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-4.86372, -0.94873, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 1.02384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, -0.9812, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 0.97846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86365, -0.94673, -0.02433],
"easing": "easeOutSine"
}
}
},
"magazine2": {
"scale": {
"vector": [0, 0, 0]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.devotion.reload_empty": {
"loop": "hold_on_last_frame",

85
src/main/resources/assets/superbwarfare/animations/hk416.animation.json
View file

@ -212,6 +212,91 @@
}
}
},
"animation.m4.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-72.70317, 6.90938, 0.15642]
},
"0.175": {
"vector": [-71.3488, 5.39879, 7.82975],
"easing": "easeInSine"
},
"0.35": {
"vector": [-72.1194, 5.16999, 1.80885],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-73.11124, 5.01587, -4.05491],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.70317, 6.90938, 0.15642]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"Righthand": {
"rotation": {
"vector": [-2.03554, 4.28304, 3.39493]
},
"position": {
"vector": [0.30134, -0.35141, 1.25128]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m4.fire": {
"animation_length": 0.04,
"override_previous_animation": true,

77
src/main/resources/assets/superbwarfare/animations/hunting_rifle.animation.json
View file

@ -132,6 +132,83 @@
}
}
},
"animation.hunting_rifle.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-69.0441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-68.56583, 25.29655, 11.27976],
"easing": "easeInSine"
},
"0.35": {
"vector": [-72.46787, 23.53474, 9.68283],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-74.63904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-69.0441, 21.19359, 4.89071]
}
},
"position": {
"0.0": {
"vector": [-5.5, 6, -1],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.5, 9, -1],
"easing": "easeInSine"
},
"0.35": {
"vector": [-8.5, 6, -2],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.5, 9, -1],
"easing": "easeInSine"
},
"0.7": {
"vector": [-5.5, 6, -1],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.hunting_rifle.fire": {
"animation_length": 0.1
},

85
src/main/resources/assets/superbwarfare/animations/m4.animation.json
View file

@ -212,6 +212,91 @@
}
}
},
"animation.m4.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-72.70317, 6.90938, 0.15642]
},
"0.175": {
"vector": [-71.3488, 5.39879, 7.82975],
"easing": "easeInSine"
},
"0.35": {
"vector": [-72.1194, 5.16999, 1.80885],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-73.11124, 5.01587, -4.05491],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.70317, 6.90938, 0.15642]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"Righthand": {
"rotation": {
"vector": [-2.03554, 4.28304, 3.39493]
},
"position": {
"vector": [0.30134, -0.35141, 1.25128]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m4.fire": {
"animation_length": 0.04,
"override_previous_animation": true,

113
src/main/resources/assets/superbwarfare/animations/m60.animation.json
View file

@ -98,7 +98,7 @@
"vector": [3.5, -2, 1]
},
"0.2": {
"vector": [1.75, -1.75, 1],
"vector": [0.75, -1.75, 1],
"easing": "easeInSine"
},
"0.4": {
@ -106,7 +106,7 @@
"easing": "easeOutSine"
},
"0.6": {
"vector": [1.75, -1.75, 1],
"vector": [2.75, -1.75, 1],
"easing": "easeInSine"
},
"0.8": {
@ -133,6 +133,115 @@
"vector": [-0.3, -0.3, 0.3]
}
}
},
"tiba": {
"rotation": {
"0.0": {
"vector": [0, 0, -22.5]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.8": {
"vector": [0, 0, -22.5]
}
}
}
}
},
"animation.m60.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-71.5441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-70.25009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.08194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-72.13904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-71.72375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-5.16449, 5.24106, -2.41075],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.01808, 7.20195, -2.4316],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.14782, 5.23777, -2.41358],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.27505, 7.25654, -2.3913],
"easing": "easeInSine"
},
"0.7": {
"vector": [-5.16513, 5.23951, -2.40714],
"easing": "easeOutSine"
}
}
},
"tiba": {
"rotation": {
"0.0": {
"vector": [0, 0, -22.5]
},
"0.175": {
"vector": [0, 0, 0]
},
"0.35": {
"vector": [0, 0, -22.5]
},
"0.525": {
"vector": [0, 0, 0]
},
"0.7": {
"vector": [0, 0, -22.5]
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},

82
src/main/resources/assets/superbwarfare/animations/m79.animation.json
View file

@ -136,6 +136,88 @@
}
}
},
"animation.m79.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-72.83252, -0.25486, -2.06771]
},
"0.175": {
"vector": [-71.3488, 5.39879, 7.82975],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.91473, 9.92603, 3.36557],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-73.11124, 5.01587, -4.05491],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.83252, -0.25486, -2.06771]
}
},
"position": {
"0.0": {
"vector": [-5.53948, -0.14083, -4.46006],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.93868, 2.05769, -5.47345],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.5991, -0.20807, -4.60947],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.50393, 2.04727, -5.53854],
"easing": "easeInSine"
},
"0.7": {
"vector": [-5.53948, -0.14083, -4.46006],
"easing": "easeOutSine"
}
}
},
"magazine2": {
"scale": {
"vector": [0, 0, 0]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m79.fire": {
"animation_length": 0.1,
"bones": {

289
src/main/resources/assets/superbwarfare/animations/m870.animation.json
View file

@ -1,6 +1,218 @@
{
"format_version": "1.8.0",
"animations": {
"animation.m870.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
"main": {
"rotation": {
"0.0": {
"vector": [-37.32442, -57.81517, 48.62375]
},
"0.2": {
"vector": [-43.14143, -59.32908, 54.3814],
"easing": "easeInSine"
},
"0.4": {
"vector": [-37.32442, -57.81517, 48.62375],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-32.09775, -56.03973, 43.41932],
"easing": "easeInSine"
},
"0.8": {
"vector": [-37.32442, -57.81517, 48.62375]
}
},
"position": {
"0.0": {
"vector": [1.5, -2, -3]
},
"0.2": {
"vector": [0.25, -1, -3],
"easing": "easeInSine"
},
"0.4": {
"vector": [-1.5, -1.5, -2],
"easing": "easeOutSine"
},
"0.6": {
"vector": [0.25, -0.5, -2],
"easing": "easeInSine"
},
"0.8": {
"vector": [1.5, -2, -3]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
},
"rightarm": {
"rotation": {
"vector": [-3.89081, 10.49539, 14.96336]
},
"position": {
"vector": [1.66, 0.55, 0.97]
}
}
}
},
"animation.m870.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-72.70317, 6.90938, 0.15642]
},
"0.175": {
"vector": [-71.3488, 5.39879, 7.82975],
"easing": "easeInSine"
},
"0.35": {
"vector": [-72.1194, 5.16999, 1.80885],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-73.11124, 5.01587, -4.05491],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.70317, 6.90938, 0.15642]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"Righthand": {
"rotation": {
"vector": [-2.03554, 4.28304, 3.39493]
},
"position": {
"vector": [0.30134, -0.35141, 1.25128]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"main": {
"rotation": {
"0.0": {
"vector": [-72.07635, 16.4431, 3.24221]
},
"0.175": {
"vector": [-69.92748, 21.92437, 13.78],
"easing": "easeInSine"
},
"0.35": {
"vector": [-70.02311, 26.48537, 9.3521],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-71.13971, 26.4587, 3.07864],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.07635, 16.4431, 3.24221]
}
},
"position": {
"0.0": {
"vector": [-5.53948, -0.14083, -4.46006],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.93868, 2.05769, -5.47345],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.5991, -0.20807, -4.60947],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.50393, 2.04727, -5.53854],
"easing": "easeInSine"
},
"0.7": {
"vector": [-5.53948, -0.14083, -4.46006],
"easing": "easeOutSine"
}
}
},
"leftarm": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m870.draw": {
"animation_length": 1,
"bones": {
@ -85,83 +297,6 @@
"loop": true,
"animation_length": 0.25
},
"animation.m870.run": {
"loop": true,
"animation_length": 0.7917,
"bones": {
"main": {
"rotation": {
"0.0": {
"vector": [-14.82442, -57.81517, 38.62375]
},
"0.2083": {
"vector": [-16.82442, -57.81517, 38.62375],
"easing": "easeInSine"
},
"0.4167": {
"vector": [-14.82442, -57.81517, 38.62375],
"easing": "easeOutSine"
},
"0.5833": {
"vector": [-12.82442, -57.81517, 38.62375],
"easing": "easeInSine"
},
"0.7917": {
"vector": [-14.82442, -57.81517, 38.62375]
}
},
"position": {
"0.0": {
"vector": [1.5, 0, 0]
},
"0.2083": {
"vector": [-0.25, 0.5, 0],
"easing": "easeInSine"
},
"0.4167": {
"vector": [-1.5, 0, 0],
"easing": "easeOutSine"
},
"0.5833": {
"vector": [-0.25, 0.5, 0],
"easing": "easeInSine"
},
"0.7917": {
"vector": [1.5, 0, 0]
}
}
},
"rightarm": {
"position": {
"0.0": {
"vector": [2.3, 0.9, -3.1]
},
"0.7917": {
"vector": [2.3, 0.9, -3.1]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2083": {
"vector": [0.3, 0, -0.3]
},
"0.4167": {
"vector": [-0.3, 0.3, 0.3]
},
"0.5833": {
"vector": [0.3, 0, -0.3]
},
"0.7917": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m870.prepare": {
"animation_length": 0.75,
"bones": {

112
src/main/resources/assets/superbwarfare/animations/m98b.animation.json
View file

@ -156,104 +156,86 @@
}
}
},
"animation.m98b.hit": {
"animation_length": 0.6,
"animation.m98b.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
"vector": [-65.32786, 12.14905, 0.43184]
},
"0.2": {
"vector": [-147.50541, 34.52809, 101.28078],
"easing": "easeOutSine"
},
"0.4": {
"vector": [-13.26827, 5.92455, 35.88217],
"0.175": {
"vector": [-65.21083, 16.27391, 6.66077],
"easing": "easeInSine"
},
"0.6": {
"vector": [0, 0, 0],
"0.35": {
"vector": [-68.74727, 14.25203, 5.74607],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-70.53091, 9.93418, -3.00092],
"easing": "easeInSine"
},
"0.7": {
"vector": [-65.32786, 12.14905, 0.43184]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [3.36, -2.44, -4.42]
},
"0.2": {
"vector": [8.55, -0.7, -9.85],
"vector": [-4.52807, 1.28395, -0.712],
"easing": "easeOutSine"
},
"0.4": {
"vector": [0.97, 0.75, -3.12],
"0.175": {
"vector": [-5.57571, 3.65883, -0.7884],
"easing": "easeInSine"
},
"0.6": {
"vector": [0, 0, 0],
"0.35": {
"vector": [-7.57844, 1.1221, -2.22187],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-5.75027, 3.85577, -0.76616],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.52807, 1.28395, -0.712],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3": {
"vector": [135, 0, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [-4.29, 19.16875, -9.15]
},
"0.3": {
"vector": [-6, 16, -10],
"easing": "easeOutSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
"vector": [6, -13, 49]
}
},
"Righthand": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3": {
"vector": [112.5, 0, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
"vector": [0.91131, 14.09621, -8.80599]
},
"position": {
"vector": [2.87519, -0.6965, 0.78255]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
"vector": [-0.3, -0.3, 0.3]
},
"0.3": {
"vector": [0, 15, -10],
"easing": "easeOutSine"
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}

143
src/main/resources/assets/superbwarfare/animations/marlin.animation.json
View file

@ -114,6 +114,11 @@
}
}
},
"bullet": {
"scale": {
"vector": [0, 0, 0]
}
},
"camera": {
"rotation": {
"0.0": {
@ -132,10 +137,142 @@
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"bullet": {
"scale": {
"vector": [0, 0, 0]
"animation.marlin.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-72.70317, 6.90938, 0.15642]
},
"0.175": {
"vector": [-71.3488, 5.39879, 7.82975],
"easing": "easeInSine"
},
"0.35": {
"vector": [-72.1194, 5.16999, 1.80885],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-73.11124, 5.01587, -4.05491],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.70317, 6.90938, 0.15642]
}
},
"position": {
"0.0": {
"vector": [-4.36372, 6.30127, 1.9764],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-5.68, 8.52384, 0.92456],
"easing": "easeInSine"
},
"0.35": {
"vector": [-6.70607, 6.2688, 1.83533],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-5.78238, 9.47846, 0.93809],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.36372, 6.30127, 1.9764],
"easing": "easeOutSine"
}
}
},
"main": {
"rotation": {
"0.0": {
"vector": [-72.07635, 16.4431, 3.24221]
},
"0.175": {
"vector": [-69.92748, 21.92437, 13.78],
"easing": "easeInSine"
},
"0.35": {
"vector": [-70.02311, 26.48537, 9.3521],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-71.13971, 26.4587, 3.07864],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.07635, 16.4431, 3.24221]
}
},
"position": {
"0.0": {
"vector": [-5.53948, -0.14083, -4.46006],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.93868, 2.05769, -5.47345],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.5991, -0.20807, -4.60947],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.50393, 2.04727, -5.53854],
"easing": "easeInSine"
},
"0.7": {
"vector": [-5.53948, -0.14083, -4.46006],
"easing": "easeOutSine"
}
}
},
"leftarm": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"Righthand": {
"rotation": {
"vector": [-2.03554, 4.28304, 3.39493]
},
"position": {
"vector": [0.30134, -0.35141, 1.25128]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}

78
src/main/resources/assets/superbwarfare/animations/minigun.animation.json
View file

@ -68,6 +68,7 @@
}
},
"animation.minigun.run": {
"loop": true,
"animation_length": 0.7917,
"bones": {
"0": {
@ -94,22 +95,22 @@
},
"position": {
"0.0": {
"vector": [12.5, -3, 1]
"vector": [12.5, -2, 1]
},
"0.2083": {
"vector": [10.75, -2.75, 1],
"vector": [10.75, -1.75, 1],
"easing": "easeInSine"
},
"0.4167": {
"vector": [9.5, -3, 1],
"vector": [9.5, -2, 1],
"easing": "easeOutSine"
},
"0.5833": {
"vector": [10.75, -2.75, 1],
"vector": [10.75, -1.75, 1],
"easing": "easeInSine"
},
"0.7917": {
"vector": [12.5, -3, 1],
"vector": [12.5, -2, 1],
"easing": "easeOutSine"
}
}
@ -134,6 +135,73 @@
}
}
}
},
"animation.minigun.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-20.28841, -26.3552, 5.35029]
},
"0.175": {
"vector": [-27.9856, -28.6052, 14.64973],
"easing": "linear"
},
"0.35": {
"vector": [-20.28841, -26.3552, 5.35029],
"easing": "linear"
},
"0.525": {
"vector": [-14.36141, -23.13847, -3.20665],
"easing": "linear"
},
"0.7": {
"vector": [-20.28841, -26.3552, 5.35029]
}
},
"position": {
"0.0": {
"vector": [15.5, 1, 1]
},
"0.175": {
"vector": [12.75, 2.25, 1],
"easing": "easeInSine"
},
"0.35": {
"vector": [10.5, 1, 1],
"easing": "easeInSine"
},
"0.525": {
"vector": [12.75, 2.25, 1],
"easing": "easeInSine"
},
"0.7": {
"vector": [15.5, 1, 1]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
}
},
"geckolib_format_version": 2

99
src/main/resources/assets/superbwarfare/animations/mk14ebr.animation.json
View file

@ -83,44 +83,42 @@
"0": {
"rotation": {
"0.0": {
"vector": [-14.82442, -57.81517, 38.62375]
"vector": [-3.58141, -58.99717, 19.60323]
},
"0.2": {
"vector": [-16.82442, -57.81517, 38.62375],
"vector": [-11.89785, -58.93146, 29.32067],
"easing": "easeInSine"
},
"0.4": {
"vector": [-14.82442, -57.81517, 38.62375],
"vector": [-6.86592, -58.7588, 29.27447],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-12.82442, -57.81517, 38.62375],
"vector": [-4.1129, -58.86791, 19.61564],
"easing": "easeInSine"
},
"0.8": {
"vector": [-14.82442, -57.81517, 38.62375],
"easing": "easeOutSine"
"vector": [-3.58141, -58.99717, 19.60323]
}
},
"position": {
"0.0": {
"vector": [3.5, -2, 0]
"vector": [2.5, -1, 0]
},
"0.2": {
"vector": [2.75, -1.5, 0],
"vector": [0.75, -0.5, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -2, 0],
"vector": [-0.5, -1, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [2.75, -1.5, 0],
"vector": [1.25, -0.5, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [3.5, -2, 0],
"easing": "easeOutSine"
"vector": [2.5, -1, 0]
}
}
},
@ -145,6 +143,83 @@
}
}
},
"animation.m14.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-71.5441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-70.25009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.08194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-72.13904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-71.72375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-5.5, 2, -2],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.5, 4, -2],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.5, 2, -2],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.5, 4, -2],
"easing": "easeInSine"
},
"0.7": {
"vector": [-5.5, 2, -2],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m14.fire": {
"animation_length": 0.0833
},

137
src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json
View file

@ -44,6 +44,113 @@
}
}
},
"animation.ntw_20.fire": {
"loop": "hold_on_last_frame",
"animation_length": 0.7917,
"bones": {
"action": {
"position": {
"0.0": {
"vector": [0, 0, 4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
},
"Lefthand": {
"position": {
"0.0": {
"vector": [0, 0, -4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
}
}
},
"animation.ntw_20.run_fast": {
"loop": true,
"animation_length": 0.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-59.0441, 21.19359, 4.89071]
},
"0.2": {
"vector": [-57.75009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.4": {
"vector": [-63.58194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-64.63904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.8": {
"vector": [-59.22375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-7.5, 1, -3],
"easing": "easeOutSine"
},
"0.2": {
"vector": [-8.5, 4, -3],
"easing": "easeInSine"
},
"0.4": {
"vector": [-9.5, 1, -3],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-8.5, 4, -3],
"easing": "easeInSine"
},
"0.8": {
"vector": [-7.5, 1, -3],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.ntw_20.run": {
"loop": true,
"animation_length": 0.8,
@ -113,36 +220,6 @@
}
}
},
"animation.ntw_20.fire": {
"loop": "hold_on_last_frame",
"animation_length": 0.7917,
"bones": {
"action": {
"position": {
"0.0": {
"vector": [0, 0, 4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
},
"Lefthand": {
"position": {
"0.0": {
"vector": [0, 0, -4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
}
}
},
"animation.ntw_20.shift": {
"loop": "hold_on_last_frame",
"animation_length": 2,

94
src/main/resources/assets/superbwarfare/animations/rpg.animation.json
View file

@ -156,6 +156,100 @@
}
}
},
"animation.rpg.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-13.3263, 7.54702, 1.59969],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-27.62174, 12.50143, 4.04527],
"easing": "easeInSine"
},
"0.35": {
"vector": [-13.035, 17.54299, 1.66321],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-23.67296, 3.37897, -3.44474],
"easing": "easeInSine"
},
"0.7": {
"vector": [-13.3263, 7.54702, 1.59969],
"easing": "easeOutSine"
}
},
"position": {
"0.0": {
"vector": [-1, 2, 1]
},
"0.175": {
"vector": [-2, 3, 1],
"easing": "easeInSine"
},
"0.35": {
"vector": [-3, 2, 1],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-2, 3, 1],
"easing": "easeInSine"
},
"0.7": {
"vector": [-1, 2, 1],
"easing": "easeOutSine"
}
}
},
"Rockets": {
"rotation": {
"vector": [0, 0, 0]
},
"position": {
"vector": [0, 0, 0]
}
},
"Righthand": {
"rotation": {
"vector": [6.14572, 9.14706, -6.29764]
},
"position": {
"vector": [1.52734, 0.09375, 1.92969]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.rpg.fire": {
"animation_length": 0.1
},

98
src/main/resources/assets/superbwarfare/animations/rpk.animation.json
View file

@ -51,6 +51,14 @@
}
}
},
"Lefthand": {
"rotation": {
"vector": [-13.63191, -29.3657, -16.88895]
},
"position": {
"vector": [0.025, -0.11563, -1.60625]
}
},
"camera": {
"rotation": {
"0.0": {
@ -68,14 +76,6 @@
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-13.63191, -29.3657, -16.88895]
},
"position": {
"vector": [0.025, -0.11563, -1.60625]
}
}
}
},
@ -319,6 +319,88 @@
}
}
},
"animation.ak47.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-71.5441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-70.25009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.08194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-72.13904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-71.72375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"magazine2": {
"scale": {
"vector": [0, 0, 0]
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.ak47.fire": {
"animation_length": 0.05,
"override_previous_animation": true,

82
src/main/resources/assets/superbwarfare/animations/sks.animation.json
View file

@ -122,6 +122,88 @@
}
}
},
"animation.sks.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-71.5441, 21.19359, 4.89071]
},
"0.175": {
"vector": [-70.25009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.08194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-72.13904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-71.72375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"magazine2": {
"scale": {
"vector": [0, 0, 0]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.sks.fire": {
"animation_length": 0.05,
"override_previous_animation": true,

163
src/main/resources/assets/superbwarfare/animations/svd.animation.json
View file

@ -128,6 +128,88 @@
}
}
},
"animation.svd.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-72.45804, 11.68036, 1.67272]
},
"0.175": {
"vector": [-71.12934, 10.13346, 9.45227],
"easing": "easeInSine"
},
"0.35": {
"vector": [-71.91473, 9.92603, 3.36557],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-72.92126, 9.79807, -2.58254],
"easing": "easeInSine"
},
"0.7": {
"vector": [-72.62992, 11.69068, 1.60578]
}
},
"position": {
"0.0": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
},
"0.175": {
"vector": [-6.18, 4.52384, -1.07544],
"easing": "easeInSine"
},
"0.35": {
"vector": [-7.20607, 2.2688, -0.16467],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-6.28238, 4.47846, -1.06191],
"easing": "easeInSine"
},
"0.7": {
"vector": [-4.86372, 2.30127, -0.0236],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"magazine2": {
"scale": {
"vector": [0, 0, 0]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.svd.fire": {
"animation_length": 0.05,
"override_previous_animation": true
@ -818,10 +900,10 @@
"bones": {
"0": {
"rotation": {
"0.0417": {
"0.0": {
"vector": [0, 0, 0]
},
"0.125": {
"0.0833": {
"vector": [1.18324, 1.40448, 3.98547]
},
"0.3333": {
@ -885,7 +967,7 @@
}
},
"position": {
"0.0417": {
"0.0": {
"vector": [0, 0, 0]
},
"0.2917": {
@ -959,27 +1041,34 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.375": {
"0.1667": {
"vector": [0, 0, 0]
},
"0.4583": {
"0.25": {
"vector": [-3.81928, -8.59364, -9.17363]
},
"0.5417": {
"0.3333": {
"vector": [0, 1.5, 1]
},
"0.625": {
"0.4167": {
"vector": [0, 1.5, 1]
},
"0.5": {
"vector": [9.1979, -5.79583, 8.71524]
},
"0.5833": {
"vector": [10.8863, -6.69443, 6.90149]
},
"0.6667": {
"vector": [0, 1.5, 1]
"vector": [10.8863, -6.69443, 6.90149]
},
"0.9167": {
"1.0417": {
"vector": [0, 1.5, 1],
"easing": "easeInElastic"
},
"1.1667": {
"vector": [1.97176, -8.21825, 9.86653]
"vector": [0, 1.5, 1],
"easing": "easeInElastic"
},
"1.4167": {
"vector": [-5.02824, -8.21825, 9.86653]
@ -991,9 +1080,12 @@
"vector": [3.97176, -8.21825, 9.86653]
},
"2.0417": {
"vector": [3.97176, -8.21825, 9.86653]
},
"2.25": {
"vector": [-3.81928, -8.59364, -9.17363]
},
"2.2917": {
"2.4583": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
@ -1002,27 +1094,34 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.375": {
"0.1667": {
"vector": [0, 0, 0]
},
"0.4583": {
"0.25": {
"vector": [1.89205, -2.68839, 4.36626]
},
"0.5417": {
"0.3333": {
"vector": [0, -4, 5]
},
"0.625": {
"0.4167": {
"vector": [0, -2.2, 4.2]
},
"0.5": {
"vector": [-1.4, -0.4, 6.5]
},
"0.5833": {
"vector": [-1.4, -0.4, 6]
},
"0.6667": {
"vector": [0, -2.2, 4.2]
"vector": [-1.4, -0.4, 6]
},
"0.9167": {
"vector": [0, -17.2, 4.2],
"easing": "easeInElastic"
"1.0417": {
"vector": [0, -15.4, 4.2],
"easing": "easeOutSine"
},
"1.1667": {
"vector": [-3.1, -18, 4.1]
"vector": [0, -15.4, 4.2],
"easing": "easeOutSine"
},
"1.2083": {
"vector": [-3.1, -17.45, 3.83]
@ -1039,16 +1138,22 @@
"1.5833": {
"vector": [-3.1, -3.1, 3.2]
},
"1.7083": {
"vector": [-3.14, -3.41, 4.14]
},
"1.75": {
"vector": [-3.15, -2.85, 4.45]
"vector": [-3.025, -3.35, 4.45]
},
"1.9167": {
"vector": [-3.2, -2.6, 4.5]
"vector": [-3.2, -2.2, 4.5]
},
"2.0417": {
"vector": [-3.2, -2.2, 4.5]
},
"2.25": {
"vector": [0.79205, -1.58839, 2.26626]
},
"2.2917": {
"2.4583": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
@ -1062,7 +1167,7 @@
"0.6667": {
"vector": [0, 0, 0]
},
"0.9167": {
"1.0417": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
},
@ -1091,13 +1196,13 @@
"0.6667": {
"vector": [0, 0, 0]
},
"0.9167": {
"1.0417": {
"vector": [0, -15, 0],
"easing": "easeInElastic"
"easing": "easeOutSine"
},
"1.1667": {
"vector": [0, -15, 0],
"easing": "easeInElastic"
"easing": "easeOutSine"
},
"1.4167": {
"vector": [0.21094, -0.16719, -0.98516],
@ -1108,11 +1213,11 @@
"easing": "easeInSine"
},
"1.7083": {
"vector": [0.07, -0.37625, -0.09719],
"vector": [0.07, -0.67625, -0.09719],
"easing": "easeInSine"
},
"1.75": {
"vector": [0, 0, 0]
"vector": [0, -0.6, 0]
},
"1.9167": {
"vector": [0, 0, 0]

101
src/main/resources/assets/superbwarfare/animations/taser.animation.json
View file

@ -404,26 +404,101 @@
},
"animation.taser.run": {
"loop": true,
"animation_length": 0.7917,
"animation_length": 0.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [4.74287, -58.94632, 9.89514]
},
"0.2": {
"vector": [-8.55104, -59.60571, 19.61648],
"easing": "easeInSine"
},
"0.4": {
"vector": [-8.58141, -58.99717, 19.60323],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-0.82277, -58.8651, 9.93666],
"easing": "easeInSine"
},
"0.8": {
"vector": [4.74287, -58.94632, 9.89514]
}
},
"position": {
"0.0": {
"vector": [5.5, -3, 0]
},
"0.2": {
"vector": [3.75, -2.5, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -3, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [4.25, -2.5, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [5.5, -3, 0]
}
}
},
"Righthand": {
"rotation": {
"vector": [0, 12.5, 0]
},
"position": {
"vector": [2.19838, 0, -0.07415]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.taser.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-64.40359, 6.54216, -8.29677]
},
"0.2083": {
"0.175": {
"vector": [-63.64549, 6.90094, -2.09726],
"easing": "easeInSine"
},
"0.4167": {
"0.35": {
"vector": [-64.40359, 6.54216, -8.29677],
"easing": "easeOutSine"
},
"0.5833": {
"0.525": {
"vector": [-65.4022, 6.21514, -14.3956],
"easing": "easeInSine"
},
"0.7917": {
"0.7": {
"vector": [-64.40359, 6.54216, -8.29677],
"easing": "easeOutSine"
}
@ -433,19 +508,19 @@
"vector": [-3.5, 2, 0],
"easing": "easeOutSine"
},
"0.2083": {
"0.175": {
"vector": [-4.5, 4, 0],
"easing": "easeInSine"
},
"0.4167": {
"0.35": {
"vector": [-5.5, 2, 0],
"easing": "easeOutSine"
},
"0.5833": {
"0.525": {
"vector": [-4.5, 4, 0],
"easing": "easeInSine"
},
"0.7917": {
"0.7": {
"vector": [-3.5, 2, 0],
"easing": "easeOutSine"
}
@ -456,16 +531,16 @@
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2083": {
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.4167": {
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.5833": {
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7917": {
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}

99
src/main/resources/assets/superbwarfare/animations/trachelium.animation.json
View file

@ -12,21 +12,96 @@
"0": {
"rotation": {
"0.0": {
"vector": [-64.40359, 6.54216, -8.29677]
"vector": [4.74287, -58.94632, 9.89514]
},
"0.2": {
"vector": [-63.64549, 6.90094, -2.09726],
"vector": [-8.55104, -59.60571, 19.61648],
"easing": "easeInSine"
},
"0.4": {
"vector": [-64.40359, 6.54216, -8.29677],
"vector": [-8.58141, -58.99717, 19.60323],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-65.4022, 6.21514, -14.3956],
"vector": [-0.82277, -58.8651, 9.93666],
"easing": "easeInSine"
},
"0.8": {
"vector": [4.74287, -58.94632, 9.89514]
}
},
"position": {
"0.0": {
"vector": [5.5, -3, 0]
},
"0.2": {
"vector": [3.75, -2.5, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -3, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [4.25, -2.5, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [5.5, -3, 0]
}
}
},
"Righthand": {
"rotation": {
"vector": [0, 12.5, 0]
},
"position": {
"vector": [2.19838, 0, -0.07415]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.trachelium.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-64.40359, 6.54216, -8.29677]
},
"0.175": {
"vector": [-63.64549, 6.90094, -2.09726],
"easing": "easeInSine"
},
"0.35": {
"vector": [-64.40359, 6.54216, -8.29677],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-65.4022, 6.21514, -14.3956],
"easing": "easeInSine"
},
"0.7": {
"vector": [-64.40359, 6.54216, -8.29677],
"easing": "easeOutSine"
}
@ -36,19 +111,19 @@
"vector": [-7.5, 2, 0],
"easing": "easeOutSine"
},
"0.2": {
"0.175": {
"vector": [-8.5, 4, 0],
"easing": "easeInSine"
},
"0.4": {
"0.35": {
"vector": [-9.5, 2, 0],
"easing": "easeOutSine"
},
"0.6": {
"0.525": {
"vector": [-8.5, 4, 0],
"easing": "easeInSine"
},
"0.8": {
"0.7": {
"vector": [-7.5, 2, 0],
"easing": "easeOutSine"
}
@ -75,16 +150,16 @@
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}

91
src/main/resources/assets/superbwarfare/animations/vector.animation.json
View file

@ -191,21 +191,88 @@
"0": {
"rotation": {
"0.0": {
"vector": [-44.22375, 21.2133, 4.79361]
"vector": [4.74287, -58.94632, 9.89514]
},
"0.2": {
"vector": [-42.75009, 19.57377, 12.8696],
"vector": [-8.55104, -59.60571, 19.61648],
"easing": "easeInSine"
},
"0.4": {
"vector": [-43.58194, 19.41184, 6.64209],
"vector": [-8.58141, -58.99717, 19.60323],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-44.63904, 19.33922, 0.51567],
"vector": [-0.82277, -58.8651, 9.93666],
"easing": "easeInSine"
},
"0.8": {
"vector": [4.74287, -58.94632, 9.89514]
}
},
"position": {
"0.0": {
"vector": [5.5, -4, 0]
},
"0.2": {
"vector": [3.75, -3.5, 0],
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -4, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [4.25, -3.5, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [5.5, -4, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.vec.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-44.22375, 21.2133, 4.79361]
},
"0.175": {
"vector": [-42.75009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.35": {
"vector": [-43.58194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-44.63904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.7": {
"vector": [-44.22375, 21.2133, 4.79361]
}
},
@ -214,19 +281,19 @@
"vector": [-7.5, 2, 0],
"easing": "easeOutSine"
},
"0.2": {
"0.175": {
"vector": [-8.5, 4, 0],
"easing": "easeInSine"
},
"0.4": {
"0.35": {
"vector": [-9.5, 2, 0],
"easing": "easeOutSine"
},
"0.6": {
"0.525": {
"vector": [-8.5, 4, 0],
"easing": "easeInSine"
},
"0.8": {
"0.7": {
"vector": [-7.5, 2, 0],
"easing": "easeOutSine"
}
@ -245,16 +312,16 @@
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}

32
src/main/resources/assets/superbwarfare/geo/m870.geo.json
View file

@ -1228,34 +1228,6 @@
"down": {"uv": [0, 0], "uv_size": [0.25, 0]}
}
},
{
"origin": [0.011, 1.9966, 0.70684],
"size": [0.23732, 0.1344, 0.168],
"pivot": [0.1, 2.0638, 0.79084],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [1, 56], "uv_size": [0.25, 0.25]},
"east": {"uv": [56, 1], "uv_size": [0.25, 0.25]},
"south": {"uv": [2, 56], "uv_size": [0.25, 0.25]},
"west": {"uv": [56, 2], "uv_size": [0.25, 0.25]},
"up": {"uv": [3, 56], "uv_size": [0.25, 0.25]},
"down": {"uv": [56, 3.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-0.23339, 1.9966, 0.70684],
"size": [0.23732, 0.1344, 0.168],
"pivot": [-0.08506, 2.0638, 0.79084],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [4, 56], "uv_size": [0.25, 0.25]},
"east": {"uv": [56, 4], "uv_size": [0.25, 0.25]},
"south": {"uv": [5, 56], "uv_size": [0.25, 0.25]},
"west": {"uv": [56, 5], "uv_size": [0.25, 0.25]},
"up": {"uv": [6, 56], "uv_size": [0.25, 0.25]},
"down": {"uv": [56, 6.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-0.24953, 1.9966, 0.37557],
"size": [0.514, 0.1344, 0.3696],
@ -3063,7 +3035,7 @@
"origin": [-0.01353, 1.73917, 2.2265],
"size": [0.51091, 0.1, 0.1],
"pivot": [0.24193, 1.83917, 2.3265],
"rotation": [-1.19102, 8.42106, 20.94102],
"rotation": [-13.69102, 8.42106, 20.94102],
"uv": {
"up": {"uv": [41, 53], "uv_size": [0.5, 0.25]}
}
@ -3072,7 +3044,7 @@
"origin": [-0.48555, 1.73917, 2.2265],
"size": [0.51091, 0.1, 0.1],
"pivot": [-0.2301, 1.83917, 2.3265],
"rotation": [-1.19102, -8.42106, -20.94102],
"rotation": [-13.44102, -8.42106, -20.94102],
"uv": {
"up": {"uv": [53, 41], "uv_size": [0.5, 0.25]}
}

Some files were not shown because too many files have changed in this diff Show more