From c5e6399d9eefdf12419904a8b5c97ce02e1bef24 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Thu, 29 Aug 2024 14:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E6=96=B9=EF=BC=8C?= =?UTF-8?q?=E9=99=90=E5=88=B6=E7=82=AE=E6=89=8B=E8=A7=86=E8=A7=92=E3=80=82?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=88=86=E7=82=B8=E8=B6=85=E5=8E=8B=E4=BC=A4?= =?UTF-8?q?=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mcreator/superbwarfare/entity/Mk42Entity.java | 11 +++++++++++ .../mcreator/superbwarfare/entity/Mle1934Entity.java | 10 ++++++++++ .../superbwarfare/entity/MortarShellEntity.java | 2 +- .../mcreator/superbwarfare/tools/CustomExplosion.java | 2 +- .../data/superbwarfare/recipes/ap_head_crafting.json | 2 +- .../data/superbwarfare/recipes/he_head_crafting.json | 2 +- .../data/superbwarfare/recipes/knife_crafting.json | 2 +- .../data/superbwarfare/recipes/mortar_he_shells.json | 2 +- .../superbwarfare/recipes/rifle_ammo_crafting.json | 2 +- .../superbwarfare/recipes/steel_action_crafting.json | 2 +- .../superbwarfare/recipes/steel_barrel_crafting.json | 2 +- .../superbwarfare/recipes/steel_spring_crafting.json | 2 +- .../superbwarfare/recipes/steel_trigger_crafting.json | 2 +- .../data/superbwarfare/recipes/target_crafting.json | 2 +- 14 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java index cac20c529..cb16bb827 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java @@ -348,6 +348,17 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity, ICannonEntit public static void init() { } + protected void clampRotation(Entity entity) { + float f = Mth.wrapDegrees(entity.getXRot()); + float f1 = Mth.clamp(f, -85.0F, 15.0F); + entity.xRotO += f1 - f; + entity.setXRot(entity.getXRot() + f1 - f); + } + @Override + public void onPassengerTurned(Entity entity) { + this.clampRotation(entity); + } + public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes() .add(Attributes.MOVEMENT_SPEED, 0) diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java index 4c7a1fb40..730d3c02c 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java @@ -377,6 +377,16 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn public static void init() { } + protected void clampRotation(Entity entity) { + float f = Mth.wrapDegrees(entity.getXRot()); + float f1 = Mth.clamp(f, -30.0F, 4.0F); + entity.xRotO += f1 - f; + entity.setXRot(entity.getXRot() + f1 - f); + } + @Override + public void onPassengerTurned(Entity entity) { + this.clampRotation(entity); + } public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes() diff --git a/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java index 47cff942a..9e4ef82f5 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/MortarShellEntity.java @@ -90,7 +90,7 @@ public class MortarShellEntity extends ThrowableItemProjectile { super.tick(); if (this.level() instanceof ServerLevel serverLevel) { ParticleTool.sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, this.xo, this.yo, this.zo, - 2, 0, 0, 0, 0.02, true); + 1, 0, 0, 0, 0.001, true); } if (this.tickCount > 600 || this.isInWater()) { if (this.level() instanceof ServerLevel) { diff --git a/src/main/java/net/mcreator/superbwarfare/tools/CustomExplosion.java b/src/main/java/net/mcreator/superbwarfare/tools/CustomExplosion.java index e80ea2d65..ba565791a 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/CustomExplosion.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/CustomExplosion.java @@ -143,7 +143,7 @@ public class CustomExplosion extends Explosion { xDistance /= distance; yDistance /= distance; zDistance /= distance; - double seenPercent = getSeenPercent(position, entity); + double seenPercent = Mth.clamp(getSeenPercent(position, entity),0.25,Double.POSITIVE_INFINITY); double damagePercent = (1.0D - distanceRate) * seenPercent; double damageFinal = (damagePercent * damagePercent + damagePercent) / 2.0D * damage; diff --git a/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json b/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json index 166230599..197c9ec1e 100644 --- a/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json @@ -14,7 +14,7 @@ "item": "minecraft:iron_ingot" }, "c": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" }, "d": { "item": "superbwarfare:tungsten_rod" diff --git a/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json b/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json index 42434171c..32241bc42 100644 --- a/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json @@ -14,7 +14,7 @@ "item": "minecraft:iron_ingot" }, "c": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json b/src/main/resources/data/superbwarfare/recipes/knife_crafting.json index df906af30..57a3fee32 100644 --- a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/knife_crafting.json @@ -7,7 +7,7 @@ ], "key": { "a": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" }, "b": { "item": "minecraft:stick" diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json b/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json index c5fa6b23a..2f99b0446 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json +++ b/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json @@ -11,7 +11,7 @@ "item": "superbwarfare:fusee" }, "b": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" }, "c": { "item": "superbwarfare:high_energy_explosives" diff --git a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json index 121d0c9e8..d50d27515 100644 --- a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "tag": "forge:ingots/steel" + "tag":"forge:ingots/steel" }, "b": { "tag": "forge:plates/copper" diff --git a/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json index ce2d246bc..a6a7ef423 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json @@ -7,7 +7,7 @@ ], "key": { "a": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json index 9d173e75f..f5a8a5b2b 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json @@ -6,7 +6,7 @@ ], "key": { "a": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json index 6171d51af..9bd9f19c7 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json index 3776992ea..0dbb9b429 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json @@ -10,7 +10,7 @@ "item": "minecraft:tripwire_hook" }, "b": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/target_crafting.json b/src/main/resources/data/superbwarfare/recipes/target_crafting.json index 8f837f18d..9359e0280 100644 --- a/src/main/resources/data/superbwarfare/recipes/target_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/target_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:target" }, "b": { - "item": "superbwarfare:ingot_steel" + "tag":"forge:ingots/steel" }, "c": { "item": "minecraft:armor_stand"