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

RPK动画重制

Browse source
This commit is contained in:
Atsuihsio 2024-05-29 16:05:22 +08:00
parent 2515eff9b6
commit 60b9a9d4bf
17 changed files with 760 additions and 630 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java
View file

@ -79,15 +79,21 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
shen.setPosZ(0.5f * (float) fp); shen.setPosZ(0.8f * (float) fp);
} else { } else {
shen.setPosZ((float) fp); shen.setPosZ(1.11f * (float) fp);
}
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
shen.setPosY(0.01f * (float) fp);
} else {
shen.setPosY(0.1f * (float) fp);
} }
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
shen.setRotX(0.003f * (float) fp); shen.setRotX(0.003f * (float) fp);
} else { } else {
shen.setRotX(0.02f * (float) fp); shen.setRotX(0.025f * (float) fp);
} }
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {

9
src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java
View file

@ -31,6 +31,7 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
public void setCustomAnimations(MarlinItem animatable, long instanceId, AnimationState animationState) { public void setCustomAnimations(MarlinItem animatable, long instanceId, AnimationState animationState) {
CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone gun = getAnimationProcessor().getBone("bone");
CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone shen = getAnimationProcessor().getBone("shen");
CoreGeoBone jichui = getAnimationProcessor().getBone("jichui");
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
@ -55,9 +56,9 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
fp = player.getPersistentData().getDouble("fire_pos"); fp = player.getPersistentData().getDouble("fire_pos");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
shen.setPosZ(3f * (float) fp); shen.setPosZ(1.5f * (float) fp);
} else { } else {
shen.setPosZ(4f * (float) fp); shen.setPosZ(2f * (float) fp);
} }
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
@ -80,6 +81,10 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
CoreGeoBone flare = getAnimationProcessor().getBone("flare"); CoreGeoBone flare = getAnimationProcessor().getBone("flare");
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
jichui.setRotX(-0.52f);
}
if (stack.getOrCreateTag().getDouble("flash_time") > 0) { if (stack.getOrCreateTag().getDouble("flash_time") > 0) {
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));

17
src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java
View file

@ -37,10 +37,14 @@ public class SvdItemModel extends GeoModel<SvdItem> {
CoreGeoBone bt1 = getAnimationProcessor().getBone("bullton1"); CoreGeoBone bt1 = getAnimationProcessor().getBone("bullton1");
CoreGeoBone bt2 = getAnimationProcessor().getBone("bullton2"); CoreGeoBone bt2 = getAnimationProcessor().getBone("bullton2");
CoreGeoBone shuan = getAnimationProcessor().getBone("shuan"); CoreGeoBone shuan = getAnimationProcessor().getBone("shuan");
CoreGeoBone glass = getAnimationProcessor().getBone("glass");
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
double vy = 0;
vy = player.getPersistentData().getDouble("vy");
if (stack.getOrCreateTag().getDouble("gj") == 1) { if (stack.getOrCreateTag().getDouble("gj") == 1) {
bolt.setPosZ(3.25f); bolt.setPosZ(3.25f);
} }
@ -80,6 +84,8 @@ public class SvdItemModel extends GeoModel<SvdItem> {
holo.setScaleY(0); holo.setScaleY(0);
sight.setScaleX(1f); sight.setScaleX(1f);
sight.setScaleY(1f); sight.setScaleY(1f);
glass.setScaleX(0);
glass.setScaleY(0);
} }
CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone shen = getAnimationProcessor().getBone("shen");
@ -109,6 +115,10 @@ public class SvdItemModel extends GeoModel<SvdItem> {
shuan.setPosZ(2.4f * (float) fp); shuan.setPosZ(2.4f * (float) fp);
holo.setPosY(1.1f * (float) fp);
holo.setRotZ(-0.04f * (float) fp);
if (stack.getOrCreateTag().getDouble("flash_time") > 0) { if (stack.getOrCreateTag().getDouble("flash_time") > 0) {
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
@ -148,9 +158,6 @@ public class SvdItemModel extends GeoModel<SvdItem> {
double pit = 0; double pit = 0;
pit = player.getPersistentData().getDouble("gun_pitch"); pit = player.getPersistentData().getDouble("gun_pitch");
double vy = 0;
vy = player.getPersistentData().getDouble("vy");
move.setPosY(-1 * (float) vy); move.setPosY(-1 * (float) vy);
move.setPosX(9.3f * (float) m); move.setPosX(9.3f * (float) m);
@ -161,6 +168,10 @@ public class SvdItemModel extends GeoModel<SvdItem> {
move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); move.setRotY(1.9f * (float) yaw - 1.7f * (float) m);
glass.setPosX(0.25f * -PosX);
glass.setPosY(0.2f * (float) fp + 0.5f * (float) vy + (float) y + PosY);
CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone camera = getAnimationProcessor().getBone("camera");
player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX());

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

@ -87,6 +87,13 @@ public class GunEventHandler {
player.getAttribute(TargetModAttributes.SPREAD.get()) player.getAttribute(TargetModAttributes.SPREAD.get())
.setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) - 0.125 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2)); .setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) - 0.125 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2));
} }
if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) > 15) {
player.getAttribute(TargetModAttributes.SPREAD.get()).setBaseValue(15);
}
if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) < 0) {
player.getAttribute(TargetModAttributes.SPREAD.get()).setBaseValue(0);
}
} }
/** /**
@ -390,8 +397,8 @@ public class GunEventHandler {
projectile.beast(); projectile.beast();
} }
projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.1 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.2 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z);
projectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), projectile.shoot(player.getLookAngle().x, player.getLookAngle().y + 0.003f , player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"),
(float) player.getAttributeBaseValue(TargetModAttributes.SPREAD.get())); (float) player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()));
player.level().addFreshEntity(projectile); player.level().addFreshEntity(projectile);
} }

2
src/main/java/net/mcreator/target/event/PlayerEventHandler.java
View file

@ -333,7 +333,7 @@ public class PlayerEventHandler {
sinRes = (-18.34) * Math.pow(recoil, 2) + 8.58 * recoil; sinRes = (-18.34) * Math.pow(recoil, 2) + 8.58 * recoil;
} }
if (0.2 <= recoil && recoil < 1) { if (0.2 <= recoil && recoil < 1) {
sinRes = 2.6 * Math.pow(recoil, 2) - 5.5 * recoil + 2.167; sinRes = 2.7 * Math.pow(recoil, 2) - 5.5 * recoil + 2.167;
} }
float newPitch = ((float) (player.getXRot() - 7.5f * recoilY * ry * sinRes)); float newPitch = ((float) (player.getXRot() - 7.5f * recoilY * ry * sinRes));

2
src/main/java/net/mcreator/target/item/common/ammo/Rocket.java
View file

@ -37,7 +37,7 @@ public class Rocket extends Item implements GeoItem, AnimatedItem {
public static ItemDisplayContext transformType; public static ItemDisplayContext transformType;
public Rocket() { public Rocket() {
super(new Item.Properties().stacksTo(4).rarity(Rarity.COMMON)); super(new Item.Properties().stacksTo(16).rarity(Rarity.COMMON));
} }
@Override @Override

2
src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java
View file

@ -11,7 +11,7 @@ import java.util.List;
public class SteelTrigger extends Item { public class SteelTrigger extends Item {
public SteelTrigger() { public SteelTrigger() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON)); super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE));
} }
@Override @Override

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

@ -87,11 +87,11 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
} }
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty"));
} }
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal"));
} }
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) { if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
@ -179,7 +179,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
tag.putDouble("reload_time", 0); tag.putDouble("reload_time", 0);
} }
if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) {
if (tag.getDouble("reload_time") == 83) { if (tag.getDouble("reload_time") == 92) {
entity.getPersistentData().putDouble("id", id); entity.getPersistentData().putDouble("id", id);
if (entity instanceof ServerPlayer serverPlayer) { if (entity instanceof ServerPlayer serverPlayer) {
SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_EMPTY.get(), 100, 1); SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_EMPTY.get(), 100, 1);
@ -199,7 +199,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
GunsTool.reload(entity, GunInfo.Type.RIFLE); GunsTool.reload(entity, GunInfo.Type.RIFLE);
} }
} else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) {
if (tag.getDouble("reload_time") == 66) { if (tag.getDouble("reload_time") == 70) {
entity.getPersistentData().putDouble("id", id); entity.getPersistentData().putDouble("id", id);
if (entity instanceof ServerPlayer serverPlayer) { if (entity instanceof ServerPlayer serverPlayer) {
SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_NORMAL.get(), 100, 1); SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_NORMAL.get(), 100, 1);

4
src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java
View file

@ -247,12 +247,12 @@ public class PlayerReloadProcedure {
tag.putBoolean("reloading", true); tag.putBoolean("reloading", true);
tag.putBoolean("empty_reload", false); tag.putBoolean("empty_reload", false);
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
tag.putDouble("reload_time", 66); tag.putDouble("reload_time", 70);
} else if (tag.getInt("ammo") == 0) { } else if (tag.getInt("ammo") == 0) {
tag.putBoolean("reloading", true); tag.putBoolean("reloading", true);
tag.putDouble("empty_reload", 1); tag.putDouble("empty_reload", 1);
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
tag.putDouble("reload_time", 83); tag.putDouble("reload_time", 92);
} }
} }
if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get() if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get()

168
src/main/resources/assets/target/animations/marlin.animation.json
View file

@ -138,11 +138,6 @@
"position": { "position": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
},
"jichui": {
"rotation": {
"vector": [30, 0, 0]
}
} }
} }
}, },
@ -156,11 +151,6 @@
"position": { "position": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
},
"jichui": {
"rotation": {
"vector": [30, 0, 0]
}
} }
} }
}, },
@ -174,22 +164,19 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.0667": { "0.0667": {
"vector": [-0.27029, 0.4825, -3.47804], "vector": [-0.07669, 0.14268, -5.6755]
"easing": "easeInSine"
}, },
"0.15": { "0.1333": {
"vector": [-9.01, -1.57, 12.41] "vector": [-0.20051, 0.51542, 4.52219],
},
"0.2333": {
"vector": [-2.97836, -1.55735, 12.38264],
"easing": "linear"
},
"0.35": {
"vector": [2.48451, 0.93386, 5.21903],
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"0.4833": { "0.2167": {
"vector": [-1, 0, -1] "vector": [-2.16, 0.41, 3.62],
"easing": "easeInSine"
},
"0.3333": {
"vector": [-0.44, 0.27, 2.41],
"easing": "easeOutSine"
}, },
"0.5667": { "0.5667": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
@ -199,23 +186,21 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.0667": { "0.1": {
"vector": [0, -0.2, 0.6], "vector": [-0.4, -0.2, 0.6],
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.1833": { "0.1833": {
"vector": [0, -1.54, -0.55], "vector": [-0.42, -0.46, -0.27],
"easing": "linear"
},
"0.2833": {
"vector": [0, -0.7, 0.75],
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.3833": { "0.2667": {
"vector": [0, -0.55547, 0.93] "vector": [-0.28, -0.11, -0.18],
"easing": "easeInElastic"
}, },
"0.45": { "0.4167": {
"vector": [0, 0, -0.3] "vector": [-0.14, 0.1, 0.41],
"easing": "easeInElastic"
}, },
"0.5667": { "0.5667": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
@ -302,20 +287,6 @@
} }
} }
}, },
"jichui": {
"rotation": {
"0.0": {
"vector": [30, 0, 0]
},
"0.0833": {
"vector": [30, 0, 0]
},
"0.2": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
}
},
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": {
@ -349,16 +320,19 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.05": { "0.05": {
"vector": [-0.27029, 0.4825, -3.47804], "vector": [-0.07669, 0.14268, -5.6755]
},
"0.1333": {
"vector": [-0.20051, 0.51542, 4.52219],
"easing": "easeInOutSine"
},
"0.2": {
"vector": [-2.16, 0.41, 3.62],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.1833": {
"vector": [-5.64874, -1.83006, 2.49618],
"easing": "easeInElastic"
},
"0.2833": { "0.2833": {
"vector": [1.4362, 0.58217, 1.2273], "vector": [-0.44, 0.27, 2.41],
"easing": "easeInOutSine" "easing": "easeOutSine"
}, },
"0.45": { "0.45": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
@ -368,15 +342,21 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.05": { "0.1": {
"vector": [0, -0.4, 0.9], "vector": [-0.4, -0.2, 0.6],
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.1167": { "0.1667": {
"vector": [0, 0.08, -0.89] "vector": [-0.42, -0.46, -0.27],
"easing": "easeInElastic"
}, },
"0.2167": { "0.2333": {
"vector": [0, 0.2, 0.33] "vector": [-0.28, -0.11, -0.18],
"easing": "easeInElastic"
},
"0.3167": {
"vector": [-0.14, 0.1, 0.41],
"easing": "easeInElastic"
}, },
"0.45": { "0.45": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
@ -463,20 +443,6 @@
} }
} }
}, },
"jichui": {
"rotation": {
"0.0": {
"vector": [30, 0, 0]
},
"0.0667": {
"vector": [30, 0, 0]
},
"0.1167": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
}
},
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": {
@ -751,13 +717,10 @@
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 1151]
},
"0.0417": {
"vector": [0, 0, 0]
}, },
"0.05": { "0.05": {
"vector": [-76.61742, 60.24156, 169.59954] "vector": [0, 0, 1151]
}, },
"0.1167": { "0.1167": {
"vector": [-2.48553, -2.26, 7.48202] "vector": [-2.48553, -2.26, 7.48202]
@ -782,11 +745,11 @@
"0.5333": { "0.5333": {
"vector": [0, -0.9, 1.1919] "vector": [0, -0.9, 1.1919]
}, },
"0.5583": { "0.5667": {
"vector": [0, -0.9, 1.1919] "vector": [0, -0.9, 1.1919]
}, },
"0.575": { "0.575": {
"vector": [0, 0, 0] "vector": [0, 0, 1151]
} }
} }
}, },
@ -831,7 +794,6 @@
} }
}, },
"animation.marlin.iterativeload2": { "animation.marlin.iterativeload2": {
"loop": true,
"animation_length": 0.8333, "animation_length": 0.8333,
"bones": { "bones": {
"0": { "0": {
@ -1002,13 +964,10 @@
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 1151]
},
"0.0417": {
"vector": [0, 0, 0]
}, },
"0.05": { "0.05": {
"vector": [-76.61742, 60.24156, 169.59954] "vector": [0, 0, 1151]
}, },
"0.1167": { "0.1167": {
"vector": [-2.48553, -2.26, 7.48202] "vector": [-2.48553, -2.26, 7.48202]
@ -1033,11 +992,11 @@
"0.5333": { "0.5333": {
"vector": [0, -0.9, 1.1919] "vector": [0, -0.9, 1.1919]
}, },
"0.5583": { "0.5667": {
"vector": [0, -0.9, 1.1919] "vector": [0, -0.9, 1.1919]
}, },
"0.575": { "0.575": {
"vector": [0, 0, 0] "vector": [0, 0, 1151]
} }
} }
}, },
@ -1092,26 +1051,23 @@
"easing": "linear" "easing": "linear"
}, },
"0.075": { "0.075": {
"vector": [-18.51, 20.88, 48.37] "vector": [-17.67498, 12.32307, 51.28386]
}, },
"0.1833": { "0.1833": {
"vector": [-9.60743, 2.0394, 39.96093], "vector": [-16.60743, 2.0394, 39.96093],
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"0.3167": { "0.3167": {
"vector": [-28.52805, 6.67501, 68.08678], "vector": [-19.12116, 5.55971, 55.71985],
"easing": "easeInElastic" "easing": "easeInBack"
},
"0.4": {
"vector": [-16.86309, 4.92621, 50.64297]
}, },
"0.45": { "0.45": {
"vector": [-7.64732, 3.69466, 37.48223] "vector": [-7.92819, 1.03543, 32.79611]
}, },
"0.5417": { "0.5417": {
"vector": [-7.97396, 1.43681, 13.3542] "vector": [-7.97396, 1.43681, 13.3542]
}, },
"0.6": { "0.65": {
"vector": [0, 0, -3] "vector": [0, 0, -3]
}, },
"0.7": { "0.7": {
@ -1124,26 +1080,26 @@
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"0.075": { "0.075": {
"vector": [0.31281, 2.18, 0.46] "vector": [0.31281, 1.93, 0.46]
}, },
"0.1417": { "0.1417": {
"vector": [0.36906, 1.19, -0.07], "vector": [0.36906, 0.69, -0.07],
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"0.2333": { "0.2333": {
"vector": [0.37, 0.41969, -1.39] "vector": [0.37, -0.08031, -1.39]
}, },
"0.3417": { "0.3417": {
"vector": [0.13, 0.81, -0.21] "vector": [0.13, 0.31, -0.21]
}, },
"0.4": { "0.4": {
"vector": [0, 0, -0.65] "vector": [0, 0.25, -0.65]
}, },
"0.5": { "0.5": {
"vector": [0, 0, 0.93] "vector": [0, 0.25, 0.93]
}, },
"0.6417": { "0.6417": {
"vector": [0, 0, -0.45] "vector": [0, -0.25, -0.45]
}, },
"0.7": { "0.7": {
"vector": [0, 0, 0] "vector": [0, 0, 0]

1056
src/main/resources/assets/target/animations/rpk.animation.json
View file

File diff suppressed because it is too large Load diff

65
src/main/resources/assets/target/geo/marlin.geo.json
View file

@ -1103,17 +1103,22 @@
{ {
"name": "jichui", "name": "jichui",
"parent": "0", "parent": "0",
"pivot": [0.00022, 0.97046, 7.30123], "pivot": [0.00022, 0.97046, 7.30123]
},
{
"name": "bone4",
"parent": "jichui",
"pivot": [0.00022, 1.00776, 7.49182],
"rotation": [-30, 0, 0] "rotation": [-30, 0, 0]
}, },
{ {
"name": "hammer", "name": "hammer",
"parent": "jichui", "parent": "bone4",
"pivot": [0.00022, 2.37046, 7.50123], "pivot": [0.00022, 2.00776, 7.49182],
"rotation": [-11, 0, 0], "rotation": [-12, 0, 0],
"cubes": [ "cubes": [
{ {
"origin": [-0.14546, 1.70992, 7.1095], "origin": [-0.14546, 1.70899, 7.14546],
"size": [0.29136, 0.91377, 0.37117], "size": [0.29136, 0.91377, 0.37117],
"uv": { "uv": {
"north": {"uv": [57, 47], "uv_size": [0.25, 1]}, "north": {"uv": [57, 47], "uv_size": [0.25, 1]},
@ -1125,7 +1130,7 @@
} }
}, },
{ {
"origin": [-0.14546, 1.91293, 6.9703], "origin": [-0.14546, 1.91201, 7.00626],
"size": [0.29136, 0.69015, 0.141], "size": [0.29136, 0.69015, 0.141],
"uv": { "uv": {
"north": {"uv": [59, 14], "uv_size": [0.25, 0.75]}, "north": {"uv": [59, 14], "uv_size": [0.25, 0.75]},
@ -1137,7 +1142,7 @@
} }
}, },
{ {
"origin": [-0.14546, 2.62369, 7.15637], "origin": [-0.14546, 2.62276, 7.16889],
"size": [0.29136, 0.11985, 0.15262], "size": [0.29136, 0.11985, 0.15262],
"uv": { "uv": {
"north": {"uv": [3, 66], "uv_size": [0.25, 0.25]}, "north": {"uv": [3, 66], "uv_size": [0.25, 0.25]},
@ -1149,10 +1154,10 @@
} }
}, },
{ {
"origin": [-0.14546, 2.52477, 7.37411], "origin": [-0.14546, 2.68643, 7.21749],
"size": [0.29136, 0.2397, 0.15262], "size": [0.29136, 0.2397, 0.15262],
"pivot": [0.00022, 2.90019, 7.48847], "pivot": [0.00022, 2.96133, 7.35143],
"rotation": [-58, 0, 0], "rotation": [-39, 0, 0],
"uv": { "uv": {
"north": {"uv": [6, 66], "uv_size": [0.25, 0.25]}, "north": {"uv": [6, 66], "uv_size": [0.25, 0.25]},
"east": {"uv": [66, 6], "uv_size": [0.25, 0.25]}, "east": {"uv": [66, 6], "uv_size": [0.25, 0.25]},
@ -1163,10 +1168,10 @@
} }
}, },
{ {
"origin": [-0.14546, 2.46689, 7.16705], "origin": [-0.14546, 2.51892, 7.12249],
"size": [0.29136, 0.2397, 0.15262], "size": [0.29136, 0.2397, 0.15262],
"pivot": [0.00022, 2.84231, 7.28141], "pivot": [0.00022, 2.96133, 7.35143],
"rotation": [-35.5, 0, 0], "rotation": [-16.5, 0, 0],
"uv": { "uv": {
"north": {"uv": [9, 66], "uv_size": [0.25, 0.25]}, "north": {"uv": [9, 66], "uv_size": [0.25, 0.25]},
"east": {"uv": [66, 9], "uv_size": [0.25, 0.25]}, "east": {"uv": [66, 9], "uv_size": [0.25, 0.25]},
@ -1177,10 +1182,10 @@
} }
}, },
{ {
"origin": [-0.14546, 2.76447, 7.45651], "origin": [-0.14546, 2.92613, 7.29988],
"size": [0.29136, 0.59925, 0.07022], "size": [0.29136, 0.59925, 0.07022],
"pivot": [0.00022, 2.90019, 7.48847], "pivot": [0.00022, 2.96133, 7.35143],
"rotation": [-58, 0, 0], "rotation": [-39, 0, 0],
"uv": { "uv": {
"north": {"uv": [61, 43], "uv_size": [0.25, 0.5]}, "north": {"uv": [61, 43], "uv_size": [0.25, 0.5]},
"east": {"uv": [44, 61], "uv_size": [0.25, 0.5]}, "east": {"uv": [44, 61], "uv_size": [0.25, 0.5]},
@ -1191,10 +1196,10 @@
} }
}, },
{ {
"origin": [-0.14546, 2.95449, 7.43154], "origin": [-0.14546, 3.11007, 7.25485],
"size": [0.29136, 0.4073, 0.08427], "size": [0.29136, 0.4073, 0.08427],
"pivot": [0.00022, 2.90019, 7.48847], "pivot": [0.00022, 2.96133, 7.35143],
"rotation": [-69.75, 0, 0], "rotation": [-50.75, 0, 0],
"uv": { "uv": {
"north": {"uv": [61, 45], "uv_size": [0.25, 0.5]}, "north": {"uv": [61, 45], "uv_size": [0.25, 0.5]},
"east": {"uv": [46, 61], "uv_size": [0.25, 0.5]}, "east": {"uv": [46, 61], "uv_size": [0.25, 0.5]},
@ -1205,10 +1210,10 @@
} }
}, },
{ {
"origin": [-0.14546, 2.74083, 7.41034], "origin": [-0.14546, 2.89478, 7.22998],
"size": [0.29136, 0.3661, 0.08427], "size": [0.29136, 0.3661, 0.08427],
"pivot": [0.00022, 2.90019, 7.48847], "pivot": [0.00022, 2.96133, 7.35143],
"rotation": [-72, 0, 0], "rotation": [-53, 0, 0],
"uv": { "uv": {
"north": {"uv": [14, 66], "uv_size": [0.25, 0.25]}, "north": {"uv": [14, 66], "uv_size": [0.25, 0.25]},
"east": {"uv": [66, 14], "uv_size": [0.25, 0.25]}, "east": {"uv": [66, 14], "uv_size": [0.25, 0.25]},
@ -1219,9 +1224,9 @@
} }
}, },
{ {
"origin": [-0.14546, 1.58215, 7.33053], "origin": [-0.14546, 1.58123, 7.36649],
"size": [0.29136, 0.91377, 0.3324], "size": [0.29136, 0.91377, 0.3324],
"pivot": [0.00022, 1.92555, 7.94535], "pivot": [0.00022, 1.92463, 7.98131],
"rotation": [-13.5, 0, 0], "rotation": [-13.5, 0, 0],
"uv": { "uv": {
"north": {"uv": [57, 49], "uv_size": [0.25, 1]}, "north": {"uv": [57, 49], "uv_size": [0.25, 1]},
@ -1233,9 +1238,9 @@
} }
}, },
{ {
"origin": [-0.14546, 1.41427, 7.72851], "origin": [-0.14546, 1.41335, 7.76447],
"size": [0.29136, 0.91377, 0.3324], "size": [0.29136, 0.91377, 0.3324],
"pivot": [0.00022, 1.85807, 8.00529], "pivot": [0.00022, 1.85714, 8.04124],
"rotation": [-40.5, 0, 0], "rotation": [-40.5, 0, 0],
"uv": { "uv": {
"north": {"uv": [57, 51], "uv_size": [0.25, 1]}, "north": {"uv": [57, 51], "uv_size": [0.25, 1]},
@ -1247,9 +1252,9 @@
} }
}, },
{ {
"origin": [-0.14546, 1.41427, 7.94966], "origin": [-0.14546, 1.41335, 7.98562],
"size": [0.29136, 0.91377, 0.3324], "size": [0.29136, 0.91377, 0.3324],
"pivot": [0.00022, 1.85807, 8.00529], "pivot": [0.00022, 1.85714, 8.04124],
"rotation": [-54, 0, 0], "rotation": [-54, 0, 0],
"uv": { "uv": {
"north": {"uv": [57, 53], "uv_size": [0.25, 1]}, "north": {"uv": [57, 53], "uv_size": [0.25, 1]},
@ -1261,9 +1266,9 @@
} }
}, },
{ {
"origin": [-0.14546, 1.5663, 7.53758], "origin": [-0.14546, 1.56537, 7.57354],
"size": [0.29136, 0.91377, 0.3324], "size": [0.29136, 0.91377, 0.3324],
"pivot": [0.00022, 1.95847, 7.80824], "pivot": [0.00022, 1.95754, 7.8442],
"rotation": [-27, 0, 0], "rotation": [-27, 0, 0],
"uv": { "uv": {
"north": {"uv": [57, 55], "uv_size": [0.25, 1]}, "north": {"uv": [57, 55], "uv_size": [0.25, 1]},

54
src/main/resources/assets/target/geo/svd.geo.json
View file

@ -67,7 +67,7 @@
"origin": [-4.09, -2.76439, -28.75], "origin": [-4.09, -2.76439, -28.75],
"size": [9.18, 8.82332, 0], "size": [9.18, 8.82332, 0],
"uv": { "uv": {
"north": {"uv": [124.75, 46.375], "uv_size": [-3.25, 3.375]}, "north": {"uv": [11.875, 108.625], "uv_size": [-3.25, 3.375]},
"east": {"uv": [0, 0], "uv_size": [0, 8]}, "east": {"uv": [0, 0], "uv_size": [0, 8]},
"south": {"uv": [86.25, 91.5], "uv_size": [40.25, 34.875]}, "south": {"uv": [86.25, 91.5], "uv_size": [40.25, 34.875]},
"west": {"uv": [0, 0], "uv_size": [0, 8]}, "west": {"uv": [0, 0], "uv_size": [0, 8]},
@ -85,7 +85,7 @@
{ {
"name": "glass", "name": "glass",
"parent": "pso1", "parent": "pso1",
"pivot": [0.16719, 3.80781, -5.66641], "pivot": [0.16719, 4.28437, -5.66641],
"cubes": [ "cubes": [
{ {
"origin": [-0.31528, 3.31362, -5.66641], "origin": [-0.31528, 3.31362, -5.66641],
@ -98,6 +98,54 @@
"up": {"uv": [8, 0], "uv_size": [-8, 0]}, "up": {"uv": [8, 0], "uv_size": [-8, 0]},
"down": {"uv": [8, 0], "uv_size": [-8, 0]} "down": {"uv": [8, 0], "uv_size": [-8, 0]}
} }
},
{
"origin": [-0.31528, 3.01362, -5.66641],
"size": [0.98838, 0.3, 0],
"uv": {
"north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]},
"east": {"uv": [0, 0], "uv_size": [0, 8]},
"south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]},
"west": {"uv": [0, 0], "uv_size": [0, 8]},
"up": {"uv": [8, 0], "uv_size": [-8, 0]},
"down": {"uv": [8, 0], "uv_size": [-8, 0]}
}
},
{
"origin": [-0.31528, 4.302, -5.66641],
"size": [0.98838, 0.3, 0],
"uv": {
"north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]},
"east": {"uv": [0, 0], "uv_size": [0, 8]},
"south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]},
"west": {"uv": [0, 0], "uv_size": [0, 8]},
"up": {"uv": [8, 0], "uv_size": [-8, 0]},
"down": {"uv": [8, 0], "uv_size": [-8, 0]}
}
},
{
"origin": [0.6731, 3.352, -5.66641],
"size": [0.2, 0.85, 0],
"uv": {
"north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]},
"east": {"uv": [0, 0], "uv_size": [0, 8]},
"south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]},
"west": {"uv": [0, 0], "uv_size": [0, 8]},
"up": {"uv": [8, 0], "uv_size": [-8, 0]},
"down": {"uv": [8, 0], "uv_size": [-8, 0]}
}
},
{
"origin": [-0.51528, 3.352, -5.66641],
"size": [0.2, 0.85, 0],
"uv": {
"north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]},
"east": {"uv": [0, 0], "uv_size": [0, 8]},
"south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]},
"west": {"uv": [0, 0], "uv_size": [0, 8]},
"up": {"uv": [8, 0], "uv_size": [-8, 0]},
"down": {"uv": [8, 0], "uv_size": [-8, 0]}
}
} }
] ]
}, },
@ -10149,6 +10197,8 @@
{ {
"origin": [-0.17217, 0.05736, 0.13157], "origin": [-0.17217, 0.05736, 0.13157],
"size": [0.35, 0.05625, 0.34375], "size": [0.35, 0.05625, 0.34375],
"pivot": [0.00283, 0.08549, 0.42845],
"rotation": [0, 0, 0],
"uv": { "uv": {
"north": {"uv": [70, 88], "uv_size": [0.25, 0.25]}, "north": {"uv": [70, 88], "uv_size": [0.25, 0.25]},
"east": {"uv": [88, 70], "uv_size": [0.25, 0.25]}, "east": {"uv": [88, 70], "uv_size": [0.25, 0.25]},

12
src/main/resources/assets/target/models/displaysettings/marlin.item.json
View file

@ -10,7 +10,7 @@
"translation": [ "translation": [
-7.25, -7.25,
3.75, 3.75,
0.25 -0.5
] ]
}, },
"gui": { "gui": {
@ -20,14 +20,14 @@
178.66 178.66
], ],
"translation": [ "translation": [
-1, 0,
-0.75, -0.25,
0 0
], ],
"scale": [ "scale": [
0.35, 0.55,
0.35, 0.55,
0.35 0.55
] ]
} }
} }

BIN
src/main/resources/assets/target/sounds/rpk/rpk_reload_empty.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/target/sounds/rpk/rpk_reload_normal.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/target/textures/item/svd.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 79 KiB