diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java index 2f6234e48..6c53ce0a0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java @@ -33,8 +33,6 @@ public class MinigunItemModel extends GeoModel { public void setCustomAnimations(Minigun animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("barrel"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - CoreGeoBone light = getAnimationProcessor().getBone("light"); CoreGeoBone heat_barrels = getAnimationProcessor().getBone("heatbarrels"); Player player = Minecraft.getInstance().player; diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java index 5d6de37e0..0c30418f8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java @@ -84,7 +84,7 @@ public class MinigunItemRenderer extends GeoItemRenderer { } if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { + if (itemStack != null && itemStack.getOrCreateTag().getDouble("fire_animation") > 0) { bone.setHidden(false); bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); @@ -95,7 +95,7 @@ public class MinigunItemRenderer extends GeoItemRenderer { } if (name.equals("light")) { - bone.setHidden(itemStack == null || !(itemStack.getOrCreateTag().getDouble("flash_time") > 0)); + bone.setHidden(itemStack == null || !(itemStack.getOrCreateTag().getDouble("fire_animation") > 0)); } if (this.transformType.firstPerson() && renderingArms) { diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 82da7c1d6..5b91adcb2 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -5,11 +5,11 @@ "zoomSpread": 3, "recoil_x": 0.006, "recoil_y": 0.018, - "damage": 2, + "damage": 2.5, "headshot": 1.5, "velocity": 16, "mag": 25, - "projectile_amount": 8, + "projectile_amount": 12, "fire_interval": 4, "weight": 1, "fire_mode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index 8be24b36f..934aa6ff2 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -1,15 +1,15 @@ { "zoom_speed": 1.4, "zoom": 1.25, - "spread": 5, - "zoomSpread": 4, + "spread": 4, + "zoomSpread": 3, "recoil_x": 0.005, "recoil_y": 0.026, "damage": 3, "headshot": 1.5, "velocity": 12, "mag": 2, - "projectile_amount": 10, + "projectile_amount": 12, "fire_interval": 2, "weight": 0, "fire_mode": 0,