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-11-17 16:34:09 +08:00
parent 60205a553e
commit 0c8dcba24f
19 changed files with 2508 additions and 4306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// 1.20.1 2024-11-16T20:28:57.8771961 Tags for minecraft:item mod id superbwarfare
// 1.20.1 2024-11-17T15:53:56.1798981 Tags for minecraft:item mod id superbwarfare
cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json
0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json
295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json
@ -43,6 +43,7 @@ b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_g
a53020091752016da6602ee1b8b7e08823614344 data/superbwarfare/tags/items/military_armor.json
1ff5db892183135cbdd9c38a6b8c6e4eb287341e data/superbwarfare/tags/items/normal_gun.json
324ad3d6125d66153f899a424521bc99f2c0dde8 data/superbwarfare/tags/items/open_bolt.json
15328cd564c931cc0a4fc000596240f93a7b29a1 data/superbwarfare/tags/items/revolver.json
aaa533157491a82b8e23b2914deef67c4078cbed data/superbwarfare/tags/items/rifle.json
acd4d19dfadb71a1cec43e9c0f4a38fe8d3cf8cb data/superbwarfare/tags/items/shotgun.json
4aca0fa3f8b9f2a4920041e35e46dae7e93d5482 data/superbwarfare/tags/items/smg.json

5
src/generated/resources/data/superbwarfare/tags/items/revolver.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"superbwarfare:trachelium"
]
}

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

@ -32,6 +32,9 @@ import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import org.lwjgl.glfw.GLFW;
import static net.mcreator.superbwarfare.event.ClientEventHandler.cantFireTime;
import static net.mcreator.superbwarfare.event.ClientEventHandler.drawTime;
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class ClickHandler {
private static boolean notInGame() {
@ -99,6 +102,16 @@ public class ClickHandler {
if (player.getMainHandItem().is(ModTags.Items.GUN)) {
event.setCanceled(true);
if (stack.is(ModTags.Items.GUN) && (!(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))
&& !stack.getOrCreateTag().getBoolean("reloading")
&& !stack.getOrCreateTag().getBoolean("charging")
&& !stack.getOrCreateTag().getBoolean("need_bolt_action"))
&& cantFireTime == 0
&& drawTime < 0.01
&& !notInGame()) {
player.playSound(ModSounds.TRIGGER_CLICK.get(), 1, 1);
}
if (stack.is(ModTags.Items.GUN) && !stack.is(ModTags.Items.CANNOT_RELOAD) && stack.getOrCreateTag().getInt("ammo") <= 0) {
if (ReloadConfig.LEFT_CLICK_RELOAD.get()) {
ModUtils.PACKET_HANDLER.sendToServer(new ReloadMessage(0));

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

@ -81,8 +81,8 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt)));
shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt)));
hammer.setRotX(60 * Mth.DEG_TO_RAD * (float) fp);
lun.setRotZ(-120 * Mth.DEG_TO_RAD * (float) fp);
hammer.setRotX(60 * Mth.DEG_TO_RAD * (float) ClientEventHandler.revolverPreTime);
lun.setRotZ(-60 * Mth.DEG_TO_RAD * (float) ClientEventHandler.revolverPreTime);
CoreGeoBone root = getAnimationProcessor().getBone("root");
root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));

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

@ -100,6 +100,8 @@ public class ModItemTagProvider extends ItemTagsProvider {
this.tag(ModTags.Items.LAUNCHER).add(ModItems.M_79.get(), ModItems.RPG.get(), ModItems.JAVELIN.get());
this.tag(ModTags.Items.REVOLVER).add(ModItems.TRACHELIUM.get());
this.tag(ModTags.Items.CANNOT_RELOAD).add(ModItems.MINIGUN.get(), ModItems.BOCEK.get());
this.tag(ModTags.Items.IS_AUTO_WEAPON).add(ModItems.AA_12.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(),

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

@ -123,6 +123,8 @@ public class ClientEventHandler {
public static int miniGunRot = 0;
public static double revolverPreTime = 0;
@SubscribeEvent
public static void handleWeaponTurn(RenderHandEvent event) {
@ -151,6 +153,18 @@ public class ClientEventHandler {
return !mc.isWindowActive();
}
private static boolean revolverPre() {
Player player = Minecraft.getInstance().player;
if (player == null) return false;
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.REVOLVER)) {
return true;
}
else {
return revolverPreTime > 1;
}
}
private static boolean isMoving() {
Player player = Minecraft.getInstance().player;
return Minecraft.getInstance().options.keyLeft.isDown()
@ -253,6 +267,14 @@ public class ClientEventHandler {
// cooldown in ms
int cooldown = (int) (1000 / rps);
//左轮类
if (stack.is(ModTags.Items.REVOLVER) && holdFire) {
revolverPreTime = revolverPreTime + 0.3 * times;
} else {
revolverPreTime = Mth.clamp(revolverPreTime - 0.5 * times, 0 , 1.1);
}
if ((holdFire || burstFireSize > 0)
&& (player.getMainHandItem().is(ModTags.Items.NORMAL_GUN)
&& cantFireTime == 0
@ -264,7 +286,9 @@ public class ClientEventHandler {
&& !stack.getOrCreateTag().getBoolean("charging")
&& stack.getOrCreateTag().getInt("ammo") > 0
&& !player.getCooldowns().isOnCooldown(stack.getItem())
&& !stack.getOrCreateTag().getBoolean("need_bolt_action"))
&& !stack.getOrCreateTag().getBoolean("need_bolt_action")
&& revolverPre()
)
|| (stack.is(ModItems.MINIGUN.get())
&& !player.isSprinting()
&& stack.getOrCreateTag().getDouble("overheat") == 0
@ -311,6 +335,10 @@ public class ClientEventHandler {
if (stack.getItem() == ModItems.DEVOTION.get() && (stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) {
customRpm = 0;
}
if (revolverPreTime > 1) {
revolverPreTime = 0;
}
}
public static void shootClient(Player player) {

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

@ -144,9 +144,9 @@ public class PlayerEventHandler {
if (stack.is(ModTags.Items.GUN)) {
double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("CustomWeight");
sprintCost = (int) (2 + 0.2 * weight);
sprintCost = (int) (5 + 0.2 * weight);
} else {
sprintCost = 2;
sprintCost = 5;
}
if (!player.isSprinting()) {

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

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

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

@ -140,15 +140,6 @@ public class FireMessage {
tag.putDouble("force_stop", 1);
}
if (handItem.getItem() != ModItems.BOCEK.get()
&& handItem.getItem() != ModItems.MINIGUN.get()
&& tag.getInt("ammo") == 0
&& !tag.getBoolean("reloading")) {
if (!player.level().isClientSide()) {
SoundTool.playLocalSound(player, ModSounds.TRIGGER_CLICK.get(), 10, 1);
}
}
if (handItem.getItem() == ModItems.BOCEK.get()) {
player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.bowPullHold = true;

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

File diff suppressed because it is too large Load diff

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

File diff suppressed because it is too large Load diff

24
src/main/resources/assets/superbwarfare/geo/ak.geo.json
View file

@ -7,8 +7,8 @@
"texture_width": 256,
"texture_height": 256,
"visible_bounds_width": 35,
"visible_bounds_height": 6,
"visible_bounds_offset": [0, 0, 0]
"visible_bounds_height": 7,
"visible_bounds_offset": [0, 0.5, 0]
},
"bones": [
{
@ -9016,8 +9016,6 @@
{
"origin": [-0.0188, 3.61146, -1.22054],
"size": [0.0474, 0.37867, 0.15601],
"pivot": [0.00489, 3.80181, -1.14254],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [64, 33], "uv_size": [0.25, 0.5]},
"east": {"uv": [34, 64], "uv_size": [0.25, 0.5]},
@ -10388,8 +10386,6 @@
{
"origin": [0.45777, 3.8101, 1.79196],
"size": [0.28451, 1.4288, 0.88295],
"pivot": [0.60003, 4.5245, 2.23344],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [16.25, 125.25], "uv_size": [0.25, 1.5]},
"south": {"uv": [17.25, 125.25], "uv_size": [0.25, 1.5]},
@ -10683,8 +10679,6 @@
{
"origin": [0.47298, 3.88486, 1.5308],
"size": [0.25466, 1.27928, 1.81199],
"pivot": [0.60031, 4.5245, 1.7118],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [27.25, 126.25], "uv_size": [0.25, 1.25]},
"south": {"uv": [28.25, 126.25], "uv_size": [0.25, 1.25]},
@ -10796,8 +10790,6 @@
{
"origin": [0.4869, 3.95351, 3.30571],
"size": [0.22726, 1.14197, 0.7817],
"pivot": [0.60053, 4.5245, 3.69656],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [29.25, 108.25], "uv_size": [0.25, 1.25]},
"east": {"uv": [16.25, 118.25], "uv_size": [0.75, 1.25]},
@ -13860,8 +13852,6 @@
{
"origin": [0.43845, -3.65413, -87.3082],
"size": [0.11201, 3.3456, 0],
"pivot": [0.49609, 4.55547, -87.3082],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]},
"east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]},
@ -15338,8 +15328,6 @@
{
"origin": [0.0722, -0.48597, 7.72413],
"size": [0.85147, 0.2205, 2.90145],
"pivot": [0.49793, -0.2261, 8.58059],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [9, 86.25], "uv_size": [2.25, 0.25]},
"west": {"uv": [10.5, 85.75], "uv_size": [2.25, 0.25]},
@ -15360,8 +15348,6 @@
{
"origin": [-0.0853, -0.32847, 7.78713],
"size": [1.16647, 0.819, 2.772],
"pivot": [0.49793, -0.2261, 8.58059],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [7, 77.75], "uv_size": [2.25, 0.75]},
"west": {"uv": [7, 78.75], "uv_size": [2.25, 0.75]}
@ -15370,8 +15356,6 @@
{
"origin": [-0.08899, -0.01347, 8.22813],
"size": [1.17386, 0.567, 2.0475],
"pivot": [0.49424, -0.2261, 8.39159],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [5, 86.25], "uv_size": [1, 0.5]},
"east": {"uv": [9, 85.25], "uv_size": [1.75, 0.5]},
@ -15470,8 +15454,6 @@
{
"origin": [0.0722, -1.4784, 10.05362],
"size": [0.85147, 0.2205, 1.13745],
"pivot": [0.49793, -1.21852, 10.97652],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [12.5, 85.25], "uv_size": [1, 0.25]},
"west": {"uv": [10, 88.25], "uv_size": [1, 0.25]},
@ -15491,8 +15473,6 @@
{
"origin": [-0.0853, -1.3209, 10.12006],
"size": [1.16647, 2.205, 1.071],
"pivot": [0.49793, -1.21852, 10.97652],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [6.5, 83.75], "uv_size": [0.75, 1.75]},
"west": {"uv": [8.5, 81.75], "uv_size": [0.75, 1.75]}

27
src/main/resources/assets/superbwarfare/geo/vector.geo.json
View file

@ -462,8 +462,6 @@
{
"origin": [-0.15625, 4.25605, 0.42687],
"size": [0.3125, 0.03125, 0.28437],
"pivot": [0, 4.27168, 0.51906],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [4, 79], "uv_size": [0.25, 0.25]},
"east": {"uv": [79, 4], "uv_size": [0.25, 0.25]},
@ -1533,8 +1531,6 @@
{
"origin": [-0.39873, 2.70022, -2.41105],
"size": [0.10734, 0.25779, 1.78233],
"pivot": [-0.34506, 2.82911, -1.51988],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [39.25, 118.5], "uv_size": [-0.25, 0.25]},
"south": {"uv": [41.25, 115.5], "uv_size": [-0.25, 0.25]},
@ -1557,8 +1553,6 @@
{
"origin": [-0.39873, 1.15338, -2.41105],
"size": [0.10734, 0.25779, 1.78233],
"pivot": [-0.34506, 1.28228, -1.51988],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [42.25, 100.5], "uv_size": [-0.25, 0.25]},
"south": {"uv": [23.25, 119.5], "uv_size": [-0.25, 0.25]},
@ -2078,8 +2072,6 @@
{
"origin": [-0.12875, 1.69419, -22.96828],
"size": [0.25142, 0.14178, 1.73204],
"pivot": [-0.00305, 1.19796, -18.01333],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [42.25, 96], "uv_size": [0.25, 0.25]},
"east": {"uv": [42, 96.5], "uv_size": [0.25, 0.25]},
@ -2517,8 +2509,6 @@
{
"origin": [-0.16498, 1.64656, -24.16976],
"size": [0.32536, 0.19471, 2.59102],
"pivot": [-0.0011, 1.74369, -22.87423],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [58, 94.75], "uv_size": [0.25, 0.25]},
"east": {"uv": [56, 86.75], "uv_size": [2.5, 0.25]},
@ -6210,8 +6200,6 @@
{
"origin": [-0.30709, 3.2213, 5.98984],
"size": [0.6125, 0.1, 0.85],
"pivot": [-0.00084, 3.2713, 6.93984],
"rotation": [0, 0, 0],
"uv": {
"up": {"uv": [31, 67], "uv_size": [0.5, 0.75]}
}
@ -6219,8 +6207,6 @@
{
"origin": [-0.30709, 3.2213, 6.83984],
"size": [0.6125, 0.1, 4.25],
"pivot": [2.12458, -0.29492, 2.21846],
"rotation": [0, 0, 0],
"uv": {
"up": {"uv": [35, 43], "uv_size": [0.5, 4.25]}
}
@ -6660,8 +6646,6 @@
{
"origin": [-0.41098, 3.32019, 5.06303],
"size": [0.1, 0, 0.59922],
"pivot": [-0.44192, 3.22918, 5.36264],
"rotation": [0, 0, 0],
"uv": {
"up": {"uv": [76, 14], "uv_size": [0.25, 0.5]}
}
@ -8354,8 +8338,6 @@
{
"origin": [-0.54062, -0.19816, 10.10002],
"size": [1.08124, 0.28, 3.68437],
"pivot": [0, 0.13184, 11.18759],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [31, 93.25], "uv_size": [2.25, 0.25]},
"west": {"uv": [32.5, 92.75], "uv_size": [2.25, 0.25]},
@ -8376,8 +8358,6 @@
{
"origin": [-0.74062, 0.00184, 10.18002],
"size": [1.48124, 1.04, 3.52],
"pivot": [0, 0.13184, 11.18759],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [29, 84.75], "uv_size": [2.25, 0.75]},
"west": {"uv": [29, 85.75], "uv_size": [2.25, 0.75]}
@ -8386,8 +8366,6 @@
{
"origin": [-0.74531, 0.40184, 10.74002],
"size": [1.49061, 0.72, 2.6],
"pivot": [-0.00469, 0.13184, 10.94759],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [27, 93.25], "uv_size": [1, 0.5]},
"east": {"uv": [31, 92.25], "uv_size": [1.75, 0.5]},
@ -8486,8 +8464,6 @@
{
"origin": [-0.54062, -1.45839, 13.0581],
"size": [1.08124, 0.28, 1.44437],
"pivot": [0, -1.12839, 14.23004],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [34.5, 92.25], "uv_size": [1, 0.25]},
"west": {"uv": [32, 95.25], "uv_size": [1, 0.25]},
@ -8507,8 +8483,6 @@
{
"origin": [-0.74062, -1.25839, 13.14247],
"size": [1.48124, 2.8, 1.36],
"pivot": [0, -1.12839, 14.23004],
"rotation": [0, 0, 0],
"uv": {
"east": {"uv": [28.5, 90.75], "uv_size": [0.75, 1.75]},
"west": {"uv": [30.5, 88.75], "uv_size": [0.75, 1.75]}
@ -10407,7 +10381,6 @@
"name": "kuaimanji",
"parent": "gun",
"pivot": [0, 2.93447, -3.7579],
"rotation": [0, 0, 0],
"cubes": [
{
"origin": [-0.73965, 2.82862, -3.79579],

BIN
src/main/resources/assets/superbwarfare/sounds/edit.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/edit_mode.wav
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/javelin/javelin_reload.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/trigger_click.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/vector/vector_fire_1p.ogg
View file

Binary file not shown.

2
src/main/resources/data/superbwarfare/guns/trachelium.json
View file

@ -3,7 +3,7 @@
"recoil_x": 0.005,
"recoil_y": 0.032,
"damage": 19,
"headshot": 2.2,
"headshot": 3,
"velocity": 24,
"mag": 6,
"projectile_amount": 1,