diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java index b904be397..cac20c529 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java @@ -237,7 +237,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity, ICannonEntit 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); + entityToSpawn.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 15, 0.05f); level.addFreshEntity(entityToSpawn); if (player instanceof ServerPlayer serverPlayer) { diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java index 20449bbea..4c7a1fb40 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java @@ -248,7 +248,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn entityToSpawnLeft.setPos(this.getX() + leftPos.x, this.getEyeY() - 0.2 + leftPos.y, this.getZ() + leftPos.z); - entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.1f); + entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.05f); level.addFreshEntity(entityToSpawnLeft); //右炮管 @@ -263,7 +263,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn entityToSpawnRight.setPos(this.getX() + rightPos.x, this.getEyeY() - 0.2 + rightPos.y, this.getZ() + rightPos.z); - entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.1f); + entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.05f); level.addFreshEntity(entityToSpawnRight); player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> capability.recoilHorizon = 1); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 5a3188cff..fbe34b0fd 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -91,6 +91,8 @@ public class ModItems { 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, -3355444, -14146005, new Item.Properties())); public static final RegistryObject ANCIENT_CPU = ITEMS.register("ancient_cpu", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); + public static final RegistryObject PROPELLER = ITEMS.register("propeller", () -> new Item(new Item.Properties())); + public static final RegistryObject MOTOR = ITEMS.register("motor", () -> new Item(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/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 3b149a9aa..57c545917 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -150,6 +150,8 @@ "item.superbwarfare.mle1934_spawn_egg": "138.6mm50 Mle1934 R1938 Spawn Egg", "item.superbwarfare.drone": "Drone", "item.superbwarfare.monitor": "Monitor", + "item.superbwarfare.propeller": "Propeller", + "item.superbwarfare.motor": "Motor", "item.superbwarfare.hand_grenade": "Hand Grenade", "item.superbwarfare.rgo_grenade": "RGO Grenade", "item.superbwarfare.transcript": "Transcript", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 2af3ea168..edf5384ca 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -150,6 +150,8 @@ "item.superbwarfare.mle1934_spawn_egg": "138.6mm50 Mle1934 R1938刷怪蛋", "item.superbwarfare.drone": "无人机", "item.superbwarfare.monitor": "遥控器", + "item.superbwarfare.propeller": "螺旋桨", + "item.superbwarfare.motor": "马达", "item.superbwarfare.hand_grenade": "M67手榴弹", "item.superbwarfare.rgo_grenade": "RGO手榴弹", "item.superbwarfare.transcript": "成绩单", diff --git a/src/main/resources/assets/superbwarfare/models/item/motor.json b/src/main/resources/assets/superbwarfare/models/item/motor.json new file mode 100644 index 000000000..2043d1f06 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/motor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/motor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/propeller.json b/src/main/resources/assets/superbwarfare/models/item/propeller.json new file mode 100644 index 000000000..db20b847f --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/propeller.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/propeller" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/mortar_barrel.png b/src/main/resources/assets/superbwarfare/textures/item/mortar_barrel.png index ccdb8a1d2..2698169a8 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/mortar_barrel.png and b/src/main/resources/assets/superbwarfare/textures/item/mortar_barrel.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/mortar_deployer.png b/src/main/resources/assets/superbwarfare/textures/item/mortar_deployer.png index 2e704dc3d..28066d337 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/mortar_deployer.png and b/src/main/resources/assets/superbwarfare/textures/item/mortar_deployer.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/motor.png b/src/main/resources/assets/superbwarfare/textures/item/motor.png new file mode 100644 index 000000000..6e0601500 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/motor.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/propeller.png b/src/main/resources/assets/superbwarfare/textures/item/propeller.png new file mode 100644 index 000000000..33d20cc3a Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/propeller.png differ diff --git a/src/main/resources/data/superbwarfare/recipes/drone_crafting.json b/src/main/resources/data/superbwarfare/recipes/drone_crafting.json index 02e6ed677..c2d3c50fb 100644 --- a/src/main/resources/data/superbwarfare/recipes/drone_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/drone_crafting.json @@ -8,19 +8,19 @@ ], "key": { "a": { - "item": "minecraft:black_carpet" + "item": "superbwarfare:propeller" }, "b": { - "item": "minecraft:piston" + "item": "superbwarfare:motor" }, "c": { "item": "minecraft:compass" }, "d": { - "item": "minecraft:iron_ingot" + "item": "minecraft:iron_nugget" }, "e": { - "item": "minecraft:dropper" + "item": "superbwarfare:shield_cell" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json b/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json index 190572a77..5c877ebeb 100644 --- a/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json @@ -14,7 +14,7 @@ "item": "minecraft:beacon" }, "c": { - "item": "superbwarfare:tungsten_rod" + "item": "superbwarfare:shield_cell" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/motor_crafting.json b/src/main/resources/data/superbwarfare/recipes/motor_crafting.json new file mode 100644 index 000000000..c3f98b587 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/motor_crafting.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "aba", + "cdc" + ], + "key": { + "a": { + "tag": "forge:plates/copper" + }, + "b": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "minecraft:iron_nugget" + }, + "d": { + "item": "minecraft:lodestone" + } + }, + "result": { + "item": "superbwarfare:motor", + "count": 32 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json b/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json new file mode 100644 index 000000000..6919c9947 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " a ", + "aba", + " a " + ], + "key": { + "a": { + "tag": "minecraft:planks" + }, + "b": { + "item": "minecraft:iron_nugget" + } + }, + "result": { + "item": "superbwarfare:propeller", + "count": 2 + } +} \ No newline at end of file