diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mle1934Renderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mle1934Renderer.java index b54db9bdd..be5aca652 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mle1934Renderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/entity/Mle1934Renderer.java @@ -3,6 +3,7 @@ package net.mcreator.superbwarfare.client.renderer.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.entity.Mle1934Entity; +import net.mcreator.superbwarfare.entity.layer.Mle1934Layer; import net.mcreator.superbwarfare.entity.model.Mle1934Model; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -15,7 +16,7 @@ public class Mle1934Renderer extends GeoEntityRenderer { public Mle1934Renderer(EntityRendererProvider.Context renderManager) { super(renderManager, new Mle1934Model()); this.shadowRadius = 3f; -// this.addRenderLayer(new Mk42Layer(this)); + this.addRenderLayer(new Mle1934Layer(this)); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java index c7380be87..cf6d32643 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java @@ -1,5 +1,6 @@ package net.mcreator.superbwarfare.entity; +import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModDamageTypes; import net.mcreator.superbwarfare.init.ModEntities; import net.mcreator.superbwarfare.init.ModItems; @@ -104,7 +105,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity { @Override public double getPassengersRidingOffset() { - return super.getPassengersRidingOffset() - 0.1; + return super.getPassengersRidingOffset() - 0.075; } @Override @@ -215,15 +216,8 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity { this.getPersistentData().putInt("fire_cooldown", this.getPersistentData().getInt("fire_cooldown") - 1); } - if (this.getPersistentData().getInt("fire_cooldown") > 28) { + if (this.getPersistentData().getInt("fire_cooldown") > 72) { gunner.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - - if (Math.random() < 0.5) { - capability.recoilHorizon = -1; - } else { - capability.recoilHorizon = 1; - } - capability.cannonRecoil = 10; capability.syncPlayerVariables(gunner); }); @@ -251,45 +245,71 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity { float fireProbability = 0; int fireTime = 0; int durability = 0; + boolean salvoShoot = false; if (stack.is(ModItems.HE_5_INCHES.get())) { - hitDamage = 100; - explosionRadius = 10; - explosionDamage = 200; - fireProbability = 0.18F; + hitDamage = 130; + explosionRadius = 13; + explosionDamage = 250; + fireProbability = 0.24F; fireTime = 5; + salvoShoot = stack.getCount() > 1 || player.isCreative(); } if (stack.is(ModItems.AP_5_INCHES.get())) { - hitDamage = 450; - explosionRadius = 3; - explosionDamage = 250; + hitDamage = 550; + explosionRadius = 3.8f; + explosionDamage = 300; fireProbability = 0; fireTime = 0; - durability = 25; + durability = 35; + salvoShoot = stack.getCount() > 1 || player.isCreative(); } if (!player.isCreative()) { - stack.shrink(1); + stack.shrink(salvoShoot? 2 : 1); } - CannonShellEntity entityToSpawn = new CannonShellEntity(ModEntities.CANNON_SHELL.get(), + // TODO 将炮弹生成在正确的位置（现在均在中心） + + //左炮管 + CannonShellEntity entityToSpawnLeft = new CannonShellEntity(ModEntities.CANNON_SHELL.get(), player, level, hitDamage, explosionRadius, explosionDamage, fireProbability, fireTime).durability(durability); - entityToSpawn.setPos(this.getX(), this.getEyeY(), this.getZ()); - entityToSpawn.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 15, 0.1f); - level.addFreshEntity(entityToSpawn); + entityToSpawnLeft.setPos(this.getX(), this.getEyeY(), this.getZ()); + entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.1f); + level.addFreshEntity(entityToSpawnLeft); + + //右炮管 + if (salvoShoot) { + CannonShellEntity entityToSpawnRight = new CannonShellEntity(ModEntities.CANNON_SHELL.get(), + player, level, hitDamage, explosionRadius, explosionDamage, fireProbability, fireTime).durability(durability); + + entityToSpawnRight.setPos(this.getX(), this.getEyeY(), this.getZ()); + entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.1f); + level.addFreshEntity(entityToSpawnRight); + + player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.recoilHorizon = 1; + }); + } else { + player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.recoilHorizon = -1; + }); + } if (player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, ModSounds.MK_42_FIRE_1P.get(), 2, 1); - SoundTool.playLocalSound(serverPlayer, ModSounds.MK_42_RELOAD.get(), 2, 1); + ModUtils.queueServerWork(40, () -> { + SoundTool.playLocalSound(serverPlayer, ModSounds.MK_42_RELOAD.get(), 2, 1); + }); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_FIRE_3P.get(), SoundSource.PLAYERS, 6, 1); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_FAR.get(), SoundSource.PLAYERS, 16, 1); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_VERYFAR.get(), SoundSource.PLAYERS, 32, 1); } - this.getPersistentData().putInt("fire_cooldown", 30); + this.getPersistentData().putInt("fire_cooldown", 74); server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE, this.getX() + 5 * this.getLookAngle().x, @@ -351,7 +371,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity { if (this.isVehicle()) { this.setYRot(entity.getYRot()); this.yRotO = this.getYRot(); - this.setXRot(Mth.clamp(entity.getXRot() - 1.35f, -30, 4)); + this.setXRot(Mth.clamp(entity.getXRot() - 1f, -30, 4)); this.setRot(this.getYRot(), this.getXRot()); this.yBodyRot = entity.getYRot(); this.yHeadRot = entity.getYRot(); @@ -408,11 +428,11 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity { Entity gunner = this.getFirstPassenger(); var capability = gunner.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null); if (capability.orElse(new ModVariables.PlayerVariables()).cannonRecoil > 0) { -// if (capability.orElse(new ModVariables.PlayerVariables()).recoilHorizon == 1) { -// return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk42.fire")); -// } else { -// return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk42.fire2")); -// } + if (capability.orElse(new ModVariables.PlayerVariables()).recoilHorizon == 1) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mle1934.salvo_fire")); + } else { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mle1934.fire")); + } } } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/layer/Mle1934Layer.java b/src/main/java/net/mcreator/superbwarfare/entity/layer/Mle1934Layer.java new file mode 100644 index 000000000..5e363000f --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/entity/layer/Mle1934Layer.java @@ -0,0 +1,27 @@ +package net.mcreator.superbwarfare.entity.layer; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.entity.Mle1934Entity; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.renderer.GeoRenderer; +import software.bernie.geckolib.renderer.layer.GeoRenderLayer; + +public class Mle1934Layer extends GeoRenderLayer { + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/entity/sherman_e.png"); + + public Mle1934Layer(GeoRenderer entityRenderer) { + super(entityRenderer); + } + + @Override + public void render(PoseStack poseStack, Mle1934Entity animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + RenderType glowRenderType = RenderType.eyes(LAYER); + getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index bcab51859..f881778d7 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -61,7 +61,7 @@ public class ClientEventHandler { public static void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) { ClientLevel level = Minecraft.getInstance().level; Entity entity = event.getCamera().getEntity(); - if (level != null && entity instanceof LivingEntity living && entity.isPassenger() && entity.getVehicle() instanceof Mk42Entity) { + if (level != null && entity instanceof LivingEntity living && entity.isPassenger() && (entity.getVehicle() instanceof Mk42Entity || entity.getVehicle() instanceof Mle1934Entity)) { handleCannonCamera(event, living); } if (level != null && entity instanceof LivingEntity living diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 9ffce91ee..76bfdb916 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -80,7 +80,7 @@ public class ModItems { public static final RegistryObject SENPAI_SPAWN_EGG = ITEMS.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); public static final RegistryObject MK_42_SPAWN_EGG = ITEMS.register("mk42_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MK_42, -8348258, -2630437, new Item.Properties())); - public static final RegistryObject MLE_1934_SPAWN_EGG = ITEMS.register("mle1934_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MLE_1934, -8348258, -2630437, new Item.Properties())); + public static final RegistryObject MLE_1934_SPAWN_EGG = ITEMS.register("mle1934_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MLE_1934, -3355444, -14146005, new Item.Properties())); public static final RegistryObject DRONE = ITEMS.register("drone", Drone::new); public static final RegistryObject MONITOR = ITEMS.register("monitor", Monitor::new); diff --git a/src/main/resources/assets/superbwarfare/animations/mle1934.animation.json b/src/main/resources/assets/superbwarfare/animations/mle1934.animation.json index e7795ca23..788309c2d 100644 --- a/src/main/resources/assets/superbwarfare/animations/mle1934.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/mle1934.animation.json @@ -3,6 +3,265 @@ "animations": { "animation.mle1934.idle": { "loop": true + }, + "animation.mle1934.fire": { + "loop": "hold_on_last_frame", + "animation_length": 1, + "bones": { + "bone": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.05": { + "vector": [0.1477, 0, 0.175], + "easing": "easeInElastic", + "easingArgs": [10] + }, + "0.1": { + "vector": [-0.07, 0, -0.09], + "easing": "easeInElastic", + "easingArgs": [10] + }, + "0.15": { + "vector": [0, 0, 0], + "easing": "easeInElastic", + "easingArgs": [10] + } + } + }, + "paoguan2": { + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + }, + "0.05": { + "vector": [0, 0, 11], + "easing": "easeInElastic" + }, + "0.4917": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + }, + "0.6667": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + } + } + }, + "flare2": { + "scale": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeOutQuad" + }, + "0.0083": { + "vector": [110, 110, 110] + }, + "0.05": { + "vector": [110, 110, 110] + }, + "0.075": { + "vector": [1, 1, 1], + "easing": "easeOutQuad" + }, + "0.0917": { + "vector": [0, 0, 0] + }, + "0.6667": { + "vector": [0, 0, 0], + "easing": "easeOutQuad" + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0083": { + "vector": [4, 8, 7.5] + }, + "0.05": { + "vector": [-2, -4, -2.5] + }, + "0.0917": { + "vector": [1, 2, 1.25] + }, + "0.1333": { + "vector": [-0.5, -1, -0.625] + }, + "0.175": { + "vector": [0.25, 0.5, 0.31] + }, + "0.2167": { + "vector": [-0.12, -0.24, -0.15] + }, + "0.2583": { + "vector": [0.06, 0.12, 0.075] + }, + "0.3": { + "vector": [-0.03, -0.6, -0.0375] + }, + "0.3417": { + "vector": [0, 0, 0] + } + } + } + } + }, + "animation.mle1934.salvo_fire": { + "loop": "hold_on_last_frame", + "animation_length": 1, + "bones": { + "paoguan": { + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + }, + "0.05": { + "vector": [0, 0, 11], + "easing": "easeInElastic" + }, + "0.4917": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + }, + "0.6667": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + } + } + }, + "bone": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.05": { + "vector": [0.1477, 0, 0.175], + "easing": "easeInElastic", + "easingArgs": [10] + }, + "0.1": { + "vector": [-0.07, 0, -0.09], + "easing": "easeInElastic", + "easingArgs": [10] + }, + "0.15": { + "vector": [0, 0, 0], + "easing": "easeInElastic", + "easingArgs": [10] + } + } + }, + "paoguan2": { + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + }, + "0.05": { + "vector": [0, 0, 11], + "easing": "easeInElastic" + }, + "0.4917": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + }, + "0.6667": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + } + } + }, + "flare": { + "scale": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeOutQuad" + }, + "0.0083": { + "vector": [110, 110, 110] + }, + "0.05": { + "vector": [110, 110, 110] + }, + "0.075": { + "vector": [1, 1, 1], + "easing": "easeOutQuad" + }, + "0.0917": { + "vector": [0, 0, 0] + }, + "0.6667": { + "vector": [0, 0, 0], + "easing": "easeOutQuad" + } + } + }, + "flare2": { + "scale": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeOutQuad" + }, + "0.0083": { + "vector": [110, 110, 110] + }, + "0.05": { + "vector": [110, 110, 110] + }, + "0.075": { + "vector": [1, 1, 1], + "easing": "easeOutQuad" + }, + "0.0917": { + "vector": [0, 0, 0] + }, + "0.6667": { + "vector": [0, 0, 0], + "easing": "easeOutQuad" + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0083": { + "vector": [4, 8, 7.5] + }, + "0.05": { + "vector": [-2, -4, -2.5] + }, + "0.0917": { + "vector": [1, 2, 1.25] + }, + "0.1333": { + "vector": [-0.5, -1, -0.625] + }, + "0.175": { + "vector": [0.25, 0.5, 0.31] + }, + "0.2167": { + "vector": [-0.12, -0.24, -0.15] + }, + "0.2583": { + "vector": [0.06, 0.12, 0.075] + }, + "0.3": { + "vector": [-0.03, -0.6, -0.0375] + }, + "0.3417": { + "vector": [0, 0, 0] + } + } + } + } } }, "geckolib_format_version": 2 diff --git a/src/main/resources/assets/superbwarfare/geo/mle1934.geo.json b/src/main/resources/assets/superbwarfare/geo/mle1934.geo.json index 041bf520f..67319b6e4 100644 --- a/src/main/resources/assets/superbwarfare/geo/mle1934.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/mle1934.geo.json @@ -1864,6 +1864,69 @@ } ] }, + { + "name": "flare", + "parent": "paoguan", + "pivot": [10.4, 188, 6.25156], + "cubes": [ + { + "origin": [9.725, 187.325, 6.25156], + "size": [1.35, 1.35, 0], + "pivot": [10.4, 188, 6.25156], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-64, 64]}, + "east": {"uv": [192, 0], "uv_size": [64, 64]}, + "south": {"uv": [192, 0], "uv_size": [64, 64]}, + "west": {"uv": [192, 0], "uv_size": [64, 64]}, + "up": {"uv": [256, 64], "uv_size": [-64, -64]}, + "down": {"uv": [256, 64], "uv_size": [-64, -64]} + } + }, + { + "origin": [4.525, 187.625, 6.25156], + "size": [6.4, 1.35, 0], + "pivot": [10.4, 188.3, 6.25156], + "rotation": [-60, 0, 90], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-51.5, 64]}, + "east": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "south": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "west": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "up": {"uv": [256, 64], "uv_size": [-51.5, -64]}, + "down": {"uv": [256, 64], "uv_size": [-51.5, -64]} + } + }, + { + "origin": [4.525, 187.625, 6.25156], + "size": [6.4, 1.35, 0], + "pivot": [10.4, 188.3, 6.25156], + "rotation": [-121, 0, 90], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-51.5, 64]}, + "east": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "south": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "west": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "up": {"uv": [256, 64], "uv_size": [-51.5, -64]}, + "down": {"uv": [256, 64], "uv_size": [-51.5, -64]} + } + }, + { + "origin": [4.525, 187.625, 6.25156], + "size": [6.4, 1.35, 0], + "pivot": [10.4, 188.3, 6.25156], + "rotation": [179, 0, 90], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-51.5, 64]}, + "east": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "south": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "west": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "up": {"uv": [256, 64], "uv_size": [-51.5, -64]}, + "down": {"uv": [256, 64], "uv_size": [-51.5, -64]} + } + } + ] + }, { "name": "move", "parent": "part1", @@ -2199,6 +2262,69 @@ "pivot": [10.3845, 31.98426, 6.2307], "rotation": [90, 0, 0] }, + { + "name": "flare2", + "parent": "paoguan2", + "pivot": [-10.3, 188, 6.25156], + "cubes": [ + { + "origin": [-10.975, 187.325, 6.25156], + "size": [1.35, 1.35, 0], + "pivot": [-10.3, 188, 6.25156], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-64, 64]}, + "east": {"uv": [192, 0], "uv_size": [64, 64]}, + "south": {"uv": [192, 0], "uv_size": [64, 64]}, + "west": {"uv": [192, 0], "uv_size": [64, 64]}, + "up": {"uv": [256, 64], "uv_size": [-64, -64]}, + "down": {"uv": [256, 64], "uv_size": [-64, -64]} + } + }, + { + "origin": [-16.175, 187.625, 6.25156], + "size": [6.4, 1.35, 0], + "pivot": [-10.3, 188.3, 6.25156], + "rotation": [-60, 0, 90], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-51.5, 64]}, + "east": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "south": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "west": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "up": {"uv": [256, 64], "uv_size": [-51.5, -64]}, + "down": {"uv": [256, 64], "uv_size": [-51.5, -64]} + } + }, + { + "origin": [-16.175, 187.625, 6.25156], + "size": [6.4, 1.35, 0], + "pivot": [-10.3, 188.3, 6.25156], + "rotation": [-121, 0, 90], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-51.5, 64]}, + "east": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "south": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "west": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "up": {"uv": [256, 64], "uv_size": [-51.5, -64]}, + "down": {"uv": [256, 64], "uv_size": [-51.5, -64]} + } + }, + { + "origin": [-16.175, 187.625, 6.25156], + "size": [6.4, 1.35, 0], + "pivot": [-10.3, 188.3, 6.25156], + "rotation": [179, 0, 90], + "uv": { + "north": {"uv": [256, 0], "uv_size": [-51.5, 64]}, + "east": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "south": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "west": {"uv": [204.5, 0], "uv_size": [51.5, 64]}, + "up": {"uv": [256, 64], "uv_size": [-51.5, -64]}, + "down": {"uv": [256, 64], "uv_size": [-51.5, -64]} + } + } + ] + }, { "name": "guntop2", "parent": "paoguan2", @@ -8817,7 +8943,7 @@ }, { "name": "camera", - "pivot": [0, 58.76276, 0.97702] + "pivot": [0, 66.76276, 0] } ] } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 52b46f670..b60a50132 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -126,6 +126,7 @@ "curios.identifier.dog_tag": "Dog Tag", "item.superbwarfare.shield_cell": "Cell", "item.superbwarfare.mk42_spawn_egg": "MK-42 Spawn Egg", + "item.superbwarfare.mle1934_spawn_egg": "138.6mm50 Mle1934 R1938 Spawn Egg", "item.superbwarfare.drone": "Drone", "item.superbwarfare.monitor": "Monitor", "item.superbwarfare.hand_grenade": "Hand Grenade", @@ -203,6 +204,7 @@ "entity.superbwarfare.claymore": "Claymore", "entity.superbwarfare.senpai": "Senpai", "entity.superbwarfare.mk_42": "5''/54 Mk42", + "entity.superbwarfare.mle_1934": "138.6mm50 Mle1934 R1938", "entity.superbwarfare.drone": "Drone", "key.categories.superbwarfare": "Superb Warfare", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 1b5f8ae4c..b16920e47 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -126,6 +126,7 @@ "curios.identifier.dog_tag": "狗牌", "item.superbwarfare.shield_cell": "电池", "item.superbwarfare.mk42_spawn_egg": "MK-42刷怪蛋", + "item.superbwarfare.mle1934_spawn_egg": "138.6mm50 Mle1934 R1938刷怪蛋", "item.superbwarfare.drone": "无人机", "item.superbwarfare.monitor": "遥控器", "item.superbwarfare.hand_grenade": "M67手榴弹", @@ -203,6 +204,7 @@ "entity.superbwarfare.claymore": "阔剑地雷", "entity.superbwarfare.senpai": "野兽先辈", "entity.superbwarfare.mk_42": "5''/54 Mk42", + "entity.superbwarfare.mle_1934": "138.6mm50 Mle1934 R1938", "entity.superbwarfare.drone": "无人机", "key.categories.superbwarfare": "卓越前线", diff --git a/src/main/resources/assets/superbwarfare/models/item/ml1934_spawn_egg.json b/src/main/resources/assets/superbwarfare/models/item/ml1934_spawn_egg.json new file mode 100644 index 000000000..7a2c6da81 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/ml1934_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} \ No newline at end of file