diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java index 825ad2e49..69637d0ac 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java @@ -58,7 +58,7 @@ public class JavelinItemModel extends GeoModel { gun.setPosX(1.62f * (float) p); gun.setPosY(6.3f * (float) p - (float) (0.2f * zp)); gun.setPosZ(22.95f * (float) p + (float) (0.3f * zp)); - gun.setScaleZ(1f - (0.74f * (float) p)); + gun.setScaleZ(1f - (0.77f * (float) p)); gun.setRotZ(-4.75f * Mth.DEG_TO_RAD * (float) p + (float) (0.02f * zp)); javelin.setHidden(gun.getPosX() > 1.55); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/JavelinMissileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/JavelinMissileEntity.java index fd247c67d..d749d384b 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/JavelinMissileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/JavelinMissileEntity.java @@ -111,7 +111,7 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo entity.invulnerableTime = 0; } - entity.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage); + entity.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), 0.2f * this.damage); if (this.tickCount > 1) { if (this.level() instanceof ServerLevel) { @@ -213,7 +213,7 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), this.damage, - this.getX(), this.getY(), this.getZ(), 5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); + this.getX(), this.getY(), this.getZ(), 7f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); explosion.finalizeExplosion(false); @@ -224,7 +224,7 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo private void triggerExplode(Entity target) { CustomExplosion explosion = new CustomExplosion(this.level(), this, ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), this.damage, - target.getX(), target.getY(), target.getZ(), 5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); + target.getX(), target.getY(), target.getZ(), 7f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); explosion.finalizeExplosion(false); @@ -235,7 +235,7 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo private void causeEntityHitExplode(Entity entity) { CustomExplosion explosion = new CustomExplosion(this.level(), this, ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), this.damage, - entity.getX(), entity.getY(), entity.getZ(), 5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); + entity.getX(), entity.getY(), entity.getZ(), 7f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); explosion.finalizeExplosion(false); diff --git a/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java index adfb1a368..de50131fb 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java @@ -67,8 +67,11 @@ public class LivingEventHandler { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } - if ((damageSource.is(ModDamageTypes.PROJECTILE_BOOM) || damageSource.is(DamageTypes.ARROW)) - && (stack.getItem() == ModItems.M_79.get() || stack.getItem() == ModItems.RPG.get())) { + if ((damageSource.is(ModDamageTypes.PROJECTILE_BOOM) + || damageSource.is(ModDamageTypes.CANNON_FIRE)) + && (stack.getItem() == ModItems.M_79.get() + || stack.getItem() == ModItems.RPG.get() + || stack.getItem() == ModItems.JAVELIN.get())) { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 71a02df6d..76c2d7716 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -106,6 +106,8 @@ public class ModItems { public static final RegistryObject MORTAR_BARREL = ITEMS.register("mortar_barrel", () -> new Item(new Item.Properties())); public static final RegistryObject MORTAR_BASE_PLATE = ITEMS.register("mortar_base_plate", () -> new Item(new Item.Properties())); public static final RegistryObject MORTAR_BIPOD = ITEMS.register("mortar_bipod", () -> new Item(new Item.Properties())); + public static final RegistryObject SEEKER = ITEMS.register("seeker", () -> new Item(new Item.Properties())); + public static final RegistryObject MISSILE_ENGINE = ITEMS.register("missile_engine", () -> new Item(new Item.Properties())); public static final RegistryObject FUSEE = ITEMS.register("fusee", () -> new Item(new Item.Properties())); public static final RegistryObject PRIMER = ITEMS.register("primer", () -> new Item(new Item.Properties())); public static final RegistryObject AP_HEAD = ITEMS.register("ap_head", () -> new Item(new Item.Properties())); @@ -151,13 +153,13 @@ public class ModItems { public static final RegistryObject EPIC_MATERIAL_PACK = ITEMS.register("epic_material_pack", () -> new MaterialPack(Rarity.EPIC)); public static final RegistryObject LEGENDARY_MATERIAL_PACK = ITEMS.register("legendary_material_pack", () -> new MaterialPack(RarityTool.LEGENDARY)); - public static final RegistryObject TRACHELIUM_BLUEPRINT = ITEMS.register("trachelium_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final RegistryObject TRACHELIUM_BLUEPRINT = ITEMS.register("trachelium_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final RegistryObject GLOCK_17_BLUEPRINT = ITEMS.register("glock_17_blueprint", () -> new BlueprintItem(Rarity.COMMON)); public static final RegistryObject GLOCK_18_BLUEPRINT = ITEMS.register("glock_18_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final RegistryObject HUNTING_RIFLE_BLUEPRINT = ITEMS.register("hunting_rifle_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final RegistryObject M_79_BLUEPRINT = ITEMS.register("m_79_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final RegistryObject RPG_BLUEPRINT = ITEMS.register("rpg_blueprint", () -> new BlueprintItem(Rarity.EPIC)); - public static final RegistryObject BOCEK_BLUEPRINT = ITEMS.register("bocek_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final RegistryObject BOCEK_BLUEPRINT = ITEMS.register("bocek_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final RegistryObject M_4_BLUEPRINT = ITEMS.register("m_4_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final RegistryObject AA_12_BLUEPRINT = ITEMS.register("aa_12_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); public static final RegistryObject HK_416_BLUEPRINT = ITEMS.register("hk_416_blueprint", () -> new BlueprintItem(Rarity.EPIC)); @@ -180,6 +182,7 @@ public class ModItems { public static final RegistryObject QBZ_95_BLUEPRINT = ITEMS.register("qbz_95_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final RegistryObject K_98_BLUEPRINT = ITEMS.register("k_98_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final RegistryObject MOSIN_NAGANT_BLUEPRINT = ITEMS.register("mosin_nagant_blueprint", () -> new BlueprintItem(Rarity.RARE)); + public static final RegistryObject JAVELIN_BLUEPRINT = ITEMS.register("javelin_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); /** * Block diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java b/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java index 2510b9831..606ce9965 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java @@ -207,11 +207,15 @@ public class ModVillagers { new ItemStack(ModItems.HE_5_INCHES.get(), 1), 8, 10, 0.05f)); trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), new ItemStack(ModItems.AP_5_INCHES.get(), 1), 8, 10, 0.05f)); + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 24), + new ItemStack(ModItems.JAVELIN_MISSILE.get(), 1), 8, 10, 0.05f)); trades.get(5).add(new BasicItemListing(new ItemStack(ModItems.HE_5_INCHES.get(), 1), - new ItemStack(Items.EMERALD, 8), 32, 2, 0.05f)); + new ItemStack(Items.EMERALD, 8), 32, 4, 0.05f)); trades.get(5).add(new BasicItemListing(new ItemStack(ModItems.AP_5_INCHES.get(), 1), - new ItemStack(Items.EMERALD, 7), 32, 2, 0.05f)); + new ItemStack(Items.EMERALD, 7), 32, 4, 0.05f)); + trades.get(5).add(new BasicItemListing(new ItemStack(ModItems.JAVELIN_MISSILE.get(), 1), + new ItemStack(Items.EMERALD, 12), 32, 4, 0.05f)); } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java index 7fb4d2e4a..a1064a74a 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/BocekItem.java @@ -8,7 +8,6 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.tools.RarityTool; import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -48,7 +47,7 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { public static ItemDisplayContext transformType; public BocekItem() { - super(new Item.Properties().stacksTo(1).rarity(RarityTool.LEGENDARY)); + super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java index f1ba1cc74..498c89ae5 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java @@ -10,7 +10,6 @@ import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.PoseTool; -import net.mcreator.superbwarfare.tools.RarityTool; import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -28,10 +27,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import org.jetbrains.annotations.Nullable; @@ -55,7 +51,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { public static ItemDisplayContext transformType; public Trachelium() { - super(new Item.Properties().stacksTo(1).rarity(RarityTool.LEGENDARY)); + super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java index bbee43f13..747285f81 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java @@ -117,6 +117,10 @@ public class FireModeMessage { if (mainHandItem.getItem() == ModItems.JAVELIN.get()) { tag.putBoolean("TopMode", !tag.getBoolean("TopMode")); + if (player instanceof ServerPlayer serverPlayer) { + serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ModSounds.CANNON_ZOOM_OUT.get()), + SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 1f, 1f, serverPlayer.level().random.nextLong())); + } } } } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 2d7c2925c..f0acb1ef8 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -81,6 +81,7 @@ "item.superbwarfare.qbz_95_blueprint": "QBZ-95-1 Blueprint", "item.superbwarfare.k_98_blueprint": "KAR-98K Blueprint", "item.superbwarfare.mosin_nagant_blueprint": "Mosin Nagant Blueprint", + "item.superbwarfare.javelin_blueprint": "Javelin Blueprint", "item.superbwarfare.common_material_pack": "Common Material Pack", "item.superbwarfare.rare_material_pack": "Rare Material Pack", @@ -141,6 +142,8 @@ "item.superbwarfare.mortar_barrel": "Mortar Barrel", "item.superbwarfare.mortar_deployer": "Mortar", "item.superbwarfare.claymore_mine": "Claymore", + "item.superbwarfare.seeker": "Seeker", + "item.superbwarfare.missile_engine": "Missile Engine", "item.superbwarfare.fusee": "Fusee", "item.superbwarfare.primer": "Primer", "item.superbwarfare.ap_head": "AP Warhead", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 2010a45d1..806fa18d4 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -81,6 +81,7 @@ "item.superbwarfare.qbz_95_blueprint": "95-1式自动步枪蓝图", "item.superbwarfare.k_98_blueprint": "KAR-98K蓝图", "item.superbwarfare.mosin_nagant_blueprint": "莫辛纳甘蓝图", + "item.superbwarfare.javelin_blueprint": "标枪导弹蓝图", "item.superbwarfare.common_material_pack": "普通材料包", "item.superbwarfare.rare_material_pack": "稀有材料包", @@ -141,6 +142,8 @@ "item.superbwarfare.mortar_barrel": "迫击炮管", "item.superbwarfare.mortar_deployer": "迫击炮", "item.superbwarfare.claymore_mine": "阔剑地雷", + "item.superbwarfare.seeker": "导引头", + "item.superbwarfare.missile_engine": "导弹发动机", "item.superbwarfare.fusee": "引信", "item.superbwarfare.primer": "底火", "item.superbwarfare.ap_head": "穿甲弹头", diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin_blueprint.json b/src/main/resources/assets/superbwarfare/models/item/javelin_blueprint.json new file mode 100644 index 000000000..a22e016de --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/javelin_blueprint.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/gun_blueprint" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/missile_engine.json b/src/main/resources/assets/superbwarfare/models/item/missile_engine.json new file mode 100644 index 000000000..ea89d278f --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/missile_engine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/missile_engine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/seeker.json b/src/main/resources/assets/superbwarfare/models/item/seeker.json new file mode 100644 index 000000000..088ef004e --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/seeker.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/seeker" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/missile_engine.png b/src/main/resources/assets/superbwarfare/textures/item/missile_engine.png new file mode 100644 index 000000000..2648f7921 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/missile_engine.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/seeker.png b/src/main/resources/assets/superbwarfare/textures/item/seeker.png new file mode 100644 index 000000000..d400b860e Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/seeker.png differ diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json index ea4d97be9..1f8befa19 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json @@ -161,7 +161,7 @@ { "type": "minecraft:item", "name": "superbwarfare:trachelium_blueprint", - "weight": 60, + "weight": 10, "functions": [ { "function": "set_count", @@ -175,7 +175,7 @@ { "type": "minecraft:item", "name": "superbwarfare:aa_12_blueprint", - "weight": 60, + "weight": 20, "functions": [ { "function": "set_count", @@ -189,7 +189,7 @@ { "type": "minecraft:item", "name": "superbwarfare:sentinel_blueprint", - "weight": 60, + "weight": 20, "functions": [ { "function": "set_count", @@ -203,7 +203,7 @@ { "type": "minecraft:item", "name": "superbwarfare:ntw_20_blueprint", - "weight": 50, + "weight": 20, "functions": [ { "function": "set_count", @@ -217,7 +217,7 @@ { "type": "minecraft:item", "name": "superbwarfare:bocek_blueprint", - "weight": 50, + "weight": 10, "functions": [ { "function": "set_count", @@ -231,7 +231,21 @@ { "type": "minecraft:item", "name": "superbwarfare:minigun_blueprint", - "weight": 50, + "weight": 20, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, + { + "type": "minecraft:item", + "name": "superbwarfare:javelin_blueprint", + "weight": 15, "functions": [ { "function": "set_count", @@ -358,6 +372,20 @@ } } ] + }, + { + "type": "minecraft:item", + "name": "superbwarfare:javelin_missile", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 2 + } + } + ] } ] } diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json index 813e15d1b..b25ddedab 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json @@ -301,7 +301,7 @@ { "type": "minecraft:item", "name": "superbwarfare:trachelium_blueprint", - "weight": 5, + "weight": 10, "functions": [ { "function": "set_count", @@ -339,6 +339,34 @@ } } ] + }, + { + "type": "minecraft:item", + "name": "superbwarfare:bocek_blueprint", + "weight": 10, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, + { + "type": "minecraft:item", + "name": "superbwarfare:javelin_blueprint", + "weight": 5, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] } ] }, diff --git a/src/main/resources/data/superbwarfare/recipes/bocek_smithing.json b/src/main/resources/data/superbwarfare/recipes/bocek_smithing.json index a8d960506..ce1af4428 100644 --- a/src/main/resources/data/superbwarfare/recipes/bocek_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/bocek_smithing.json @@ -4,7 +4,7 @@ "item": "superbwarfare:bocek_blueprint" }, "base": { - "item": "superbwarfare:legendary_material_pack" + "item": "superbwarfare:epic_material_pack" }, "addition": { "item": "minecraft:bow" diff --git a/src/main/resources/data/superbwarfare/recipes/javalin_smithing.json b/src/main/resources/data/superbwarfare/recipes/javalin_smithing.json new file mode 100644 index 000000000..65622af24 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/javalin_smithing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "template": { + "item": "superbwarfare:javelin_blueprint" + }, + "base": { + "item": "superbwarfare:legendary_material_pack" + }, + "addition": { + "item": "superbwarfare:ancient_cpu" + }, + "result": { + "item": "superbwarfare:javelin" + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/javelin_missile_crafting.json b/src/main/resources/data/superbwarfare/recipes/javelin_missile_crafting.json new file mode 100644 index 000000000..1396424a4 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/javelin_missile_crafting.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " b ", + "cdc", + " e " + ], + "key": { + "b": { + "item": "superbwarfare:seeker" + }, + "c": { + "item": "minecraft:iron_ingot" + }, + "d": { + "item": "superbwarfare:high_energy_explosives" + }, + "e": { + "item": "superbwarfare:missile_engine" + } + }, + "result": { + "item": "superbwarfare:javelin_missile", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m79_smithing.json b/src/main/resources/data/superbwarfare/recipes/m79_smithing.json index b0b04c069..400f5cba1 100644 --- a/src/main/resources/data/superbwarfare/recipes/m79_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/m79_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:rare_material_pack" }, "addition": { - "tag": "minecraft:logs" + "item": "minecraft:dispenser" }, "result": { "item": "superbwarfare:m_79" diff --git a/src/main/resources/data/superbwarfare/recipes/m89b_smithing.json b/src/main/resources/data/superbwarfare/recipes/m89b_smithing.json index 0d8f0cd3e..10a6bd841 100644 --- a/src/main/resources/data/superbwarfare/recipes/m89b_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/m89b_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "minecraft:netherite_ingot" + "item": "minecraft:spyglass" }, "result": { "item": "superbwarfare:m_98b" diff --git a/src/main/resources/data/superbwarfare/recipes/minigun_smithing.json b/src/main/resources/data/superbwarfare/recipes/minigun_smithing.json index 8280ab0a9..f8e05b70f 100644 --- a/src/main/resources/data/superbwarfare/recipes/minigun_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/minigun_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:legendary_material_pack" }, "addition": { - "item": "minecraft:netherite_ingot" + "item": "superbwarfare:motor" }, "result": { "item": "superbwarfare:minigun" diff --git a/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json b/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json new file mode 100644 index 000000000..239d3a7c8 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "cdc", + " e " + ], + "key": { + "a": { + "item": "minecraft:copper_ingot" + }, + "b": { + "item": "minecraft:blast_furnace" + }, + "c": { + "item": "minecraft:iron_ingot" + }, + "d": { + "item": "superbwarfare:grain" + }, + "e": { + "item": "minecraft:firework_rocket" + } + }, + "result": { + "item": "superbwarfare:missile_engine", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rpg_smithing.json b/src/main/resources/data/superbwarfare/recipes/rpg_smithing.json index 164971adb..e14495f22 100644 --- a/src/main/resources/data/superbwarfare/recipes/rpg_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/rpg_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "tag": "minecraft:logs" + "item": "minecraft:dispenser" }, "result": { "item": "superbwarfare:rpg" diff --git a/src/main/resources/data/superbwarfare/recipes/seeker_crafting.json b/src/main/resources/data/superbwarfare/recipes/seeker_crafting.json new file mode 100644 index 000000000..866628654 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/seeker_crafting.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " a ", + "bcb", + "ded" + ], + "key": { + "a": { + "item": "minecraft:amethyst_shard" + }, + "b": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "minecraft:compass" + }, + "d": { + "item": "minecraft:quartz" + }, + "e": { + "item": "minecraft:comparator" + } + }, + "result": { + "item": "superbwarfare:seeker", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json b/src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json index f5103d0d0..45babb056 100644 --- a/src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:legendary_material_pack" }, "addition": { - "item": "minecraft:netherite_ingot" + "item": "superbwarfare:shield_cell" }, "result": { "item": "superbwarfare:sentinel" diff --git a/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json b/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json index 52f69a113..df70bfc4c 100644 --- a/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json @@ -25,6 +25,6 @@ }, "result": { "item": "superbwarfare:shield_cell", - "count": 4 + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json b/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json index d33cfefa9..2b2b5c2d3 100644 --- a/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json @@ -4,10 +4,10 @@ "item": "superbwarfare:trachelium_blueprint" }, "base": { - "item": "superbwarfare:legendary_material_pack" + "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "minecraft:netherite_ingot" + "item": "superbwarfare:cemented_carbide_ingot" }, "result": { "item": "superbwarfare:trachelium"