diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java index 0617c6393..2a3fd5e02 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java @@ -129,7 +129,7 @@ public class Ntw20Model extends GeoModel { float numR = (float) (1 - 0.92 * data.getDouble("zoom_time")); float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); - if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0 || stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { main.setRotX(numR * main.getRotX()); main.setRotY(numR * main.getRotY()); main.setRotZ(numR * main.getRotZ()); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java index efbb90035..07313e190 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java @@ -279,7 +279,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa this.setPosRaw(this.getX() + vec.x, this.getY() + vec.y, this.getZ() + vec.z); } - this.setDeltaMovement(vec.x, vec.y - 0.05000000074505806, vec.z); + this.setDeltaMovement(vec.x, vec.y - 0.02, vec.z); this.tickCount++; if (this.tickCount > 40) { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java index 54dc5d201..c4144954c 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java @@ -8,7 +8,6 @@ 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.ModVariables; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.RarityTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -94,10 +93,6 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - 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")); - } - if (stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift")); } diff --git a/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json b/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json index ac4e4df10..98ec7da86 100644 --- a/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.unknown", "texture_width": 32, "texture_height": 32, - "visible_bounds_width": 4, + "visible_bounds_width": 6, "visible_bounds_height": 6, "visible_bounds_offset": [0, -1, 0] }, @@ -22,16 +22,16 @@ "rotation": [-90, 0, -3.75], "cubes": [ { - "origin": [-1.34303, -32.03027, 10.5525], - "size": [2.352, 2.352, 0], + "origin": [-2.34303, -33.03027, 10.5525], + "size": [4.352, 4.352, 0], "uv": { "north": {"uv": [8, 0], "uv_size": [24, 24]}, "south": {"uv": [8, 0], "uv_size": [24, 24]} } }, { - "origin": [-0.16703, -62.33427, -4.3575], - "size": [0, 49.96, 1.68], + "origin": [-0.16703, -62.33427, -5.3575], + "size": [0, 49.96, 3.68], "pivot": [-0.16703, -30.85427, -3.5175], "rotation": [-90, 0, 30], "uv": { @@ -40,8 +40,8 @@ } }, { - "origin": [-0.16703, -62.33427, -4.3575], - "size": [0, 49.96, 1.68], + "origin": [-0.16703, -62.33427, -5.3575], + "size": [0, 49.96, 3.68], "pivot": [-0.16703, -30.85427, -3.5175], "rotation": [-90, 0, -30], "uv": { @@ -50,8 +50,8 @@ } }, { - "origin": [-0.16703, -62.33427, -4.3575], - "size": [0, 49.96, 1.68], + "origin": [-0.16703, -62.33427, -5.3575], + "size": [0, 49.96, 3.68], "pivot": [-0.16703, -30.85427, -3.5175], "rotation": [-90, 0, -90], "uv": { diff --git a/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json b/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json index edd3094e1..b0cb2ef23 100644 --- a/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json @@ -22,16 +22,16 @@ "rotation": [-90, 0, 0], "cubes": [ { - "origin": [-3.34303, -32.03027, 8.1525], - "size": [2.352, 2.352, 0], + "origin": [-4.34303, -33.03027, 8.1525], + "size": [4.352, 4.352, 0], "uv": { "north": {"uv": [8, 0], "uv_size": [24, 24]}, "south": {"uv": [8, 0], "uv_size": [24, 24]} } }, { - "origin": [-2.16703, -62.33427, -6.7575], - "size": [0, 49.96, 1.68], + "origin": [-2.16703, -62.33427, -7.7575], + "size": [0, 49.96, 3.68], "pivot": [-2.16703, -30.85427, -5.9175], "rotation": [-90, 0, 30], "uv": { @@ -40,8 +40,8 @@ } }, { - "origin": [-2.16703, -62.33427, -6.7575], - "size": [0, 49.96, 1.68], + "origin": [-2.16703, -62.33427, -7.7575], + "size": [0, 49.96, 3.68], "pivot": [-2.16703, -30.85427, -5.9175], "rotation": [-90, 0, -30], "uv": { @@ -50,8 +50,8 @@ } }, { - "origin": [-2.16703, -62.33427, -6.7575], - "size": [0, 49.96, 1.68], + "origin": [-2.16703, -62.33427, -7.7575], + "size": [0, 49.96, 3.68], "pivot": [-2.16703, -30.85427, -5.9175], "rotation": [-90, 0, -90], "uv": { diff --git a/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity.png b/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity.png index 4e65dffc6..1c904ba40 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity.png and b/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity_inside.png b/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity_inside.png index 02abb05f6..a9658b7fd 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity_inside.png and b/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity_inside.png differ diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 5b91adcb2..96adf22b5 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -7,7 +7,7 @@ "recoil_y": 0.018, "damage": 2.5, "headshot": 1.5, - "velocity": 16, + "velocity": 13, "mag": 25, "projectile_amount": 12, "fire_interval": 4, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index d2c6b2f57..0c6c3bfc1 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -7,7 +7,7 @@ "recoil_y": 0.012, "damage": 8.5, "headshot": 2, - "velocity": 35, + "velocity": 22, "mag": 30, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 482add644..0fec6e3ee 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -8,7 +8,7 @@ "recoil_y": 0.01, "damage": 7, "headshot": 2, - "velocity": 42.4, + "velocity": 25, "mag": 55, "projectile_amount": 1, "fire_interval": 5, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index 35df04ed9..386a3a828 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -7,7 +7,7 @@ "recoil_y": 0.009, "damage": 7.5, "headshot": 2, - "velocity": 44, + "velocity": 24, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 3a7642aa8..d6b8f71c8 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -7,7 +7,7 @@ "recoil_y": 0.011, "damage": 7, "headshot": 2, - "velocity": 44, + "velocity": 24, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 4d921c958..62b2ba34f 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -8,7 +8,7 @@ "recoil_y": 0.014, "damage": 9, "headshot": 2, - "velocity": 42.5, + "velocity": 22, "mag": 100, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 46959ebd0..ff566645a 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -7,7 +7,7 @@ "recoil_y": 0.04, "damage": 3, "headshot": 1.5, - "velocity": 16, + "velocity": 13, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 12, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 20fff0ade..b0d586b37 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -7,7 +7,7 @@ "recoil_y": 0.031, "damage": 16, "headshot": 2.5, - "velocity": 38, + "velocity": 23, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 1, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index ad5c932a5..2c39fca4c 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -6,7 +6,7 @@ "recoil_y": 0.011, "damage": 8, "headshot": 2, - "velocity": 48, + "velocity": 24, "fire_interval": 1, "weight": 2, "fire_mode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index f21f4fb9b..841183850 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -10,7 +10,7 @@ "recoil_y": 0.014, "damage": 12, "headshot": 2.5, - "velocity": 42.5, + "velocity": 25, "mag": 20, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 362272b23..d3599bfe9 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -7,7 +7,7 @@ "recoil_y": 0.009, "damage": 7.5, "headshot": 2, - "velocity": 48, + "velocity": 27, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index 1b397edd4..8d0613142 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -8,7 +8,7 @@ "recoil_y": 0.012, "damage": 8.75, "headshot": 2, - "velocity": 37, + "velocity": 24, "mag": 75, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index d195e4408..11bfe72ce 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -7,7 +7,7 @@ "recoil_y": 0.015, "damage": 9.5, "headshot": 2, - "velocity": 36.5, + "velocity": 23, "mag": 20, "projectile_amount": 1, "fire_interval": 3, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index 42917423f..f222e7558 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -7,7 +7,7 @@ "recoil_y": 0.015, "damage": 18, "headshot": 2, - "velocity": 41.5, + "velocity": 25, "mag": 10, "projectile_amount": 1, "fire_interval": 5,