From 1485921dae17993e3ddc333471e08eda4e29bac4 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 28 Aug 2024 14:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=9B=E6=A2=B0=E5=B8=88?= =?UTF-8?q?=E7=9A=84=E4=BA=A4=E6=98=93=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/init/ModTrades.java | 89 ------- .../superbwarfare/init/ModVillagers.java | 217 +++++++++++++++++- .../assets/superbwarfare/lang/en_us.json | 2 +- .../assets/superbwarfare/lang/zh_cn.json | 2 +- .../entity/villager/profession/armory.png | Bin 0 -> 3088 bytes .../villager/profession/arms_dealer.png | Bin 2993 -> 0 bytes .../zombie_villager/profession/armory.png | Bin 0 -> 3107 bytes .../profession/arms_dealer.png | Bin 2944 -> 0 bytes .../acquirable_job_site.json | 2 +- 9 files changed, 209 insertions(+), 103 deletions(-) delete mode 100644 src/main/java/net/mcreator/superbwarfare/init/ModTrades.java create mode 100644 src/main/resources/assets/superbwarfare/textures/entity/villager/profession/armory.png delete mode 100644 src/main/resources/assets/superbwarfare/textures/entity/villager/profession/arms_dealer.png create mode 100644 src/main/resources/assets/superbwarfare/textures/entity/zombie_villager/profession/armory.png delete mode 100644 src/main/resources/assets/superbwarfare/textures/entity/zombie_villager/profession/arms_dealer.png diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModTrades.java b/src/main/java/net/mcreator/superbwarfare/init/ModTrades.java deleted file mode 100644 index f56aca3bb..000000000 --- a/src/main/java/net/mcreator/superbwarfare/init/ModTrades.java +++ /dev/null @@ -1,89 +0,0 @@ -package net.mcreator.superbwarfare.init; - -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraftforge.common.BasicItemListing; -import net.minecraftforge.event.village.VillagerTradesEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE) -public class ModTrades { - @SubscribeEvent - public static void registerTrades(VillagerTradesEvent event) { - if (event.getType() == VillagerProfession.WEAPONSMITH) { - event.getTrades().get(1).add(new BasicItemListing(new ItemStack(ModItems.TASER_BLUEPRINT.get()), - new ItemStack(Items.EMERALD), 16, 5, 0.05f)); - - event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 10), - new ItemStack(ModItems.STEEL_ACTION.get()), 12, 5, 0.05f)); - - event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ModItems.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); - - event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ModItems.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); - - event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ModItems.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); - - event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(ModItems.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(ModItems.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD), - new ItemStack(ModItems.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); - - event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(ModItems.STEEL_BARREL.get()), 12, 5, 0.05f)); - - event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 6), - new ItemStack(ModItems.STEEL_TRIGGER.get()), 12, 5, 0.05f)); - - event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(ModItems.STEEL_SPRING.get()), 12, 5, 0.05f)); - - event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(ModItems.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); - - event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), - new ItemStack(ModItems.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); - - event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(ModItems.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); - - event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), - new ItemStack(ModItems.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); - } - } -} diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java b/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java index ed02def52..6b6ee31a4 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModVillagers.java @@ -8,7 +8,7 @@ import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.entity.npc.VillagerTrades; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraftforge.common.BasicItemListing; import net.minecraftforge.event.village.VillagerTradesEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -24,11 +24,11 @@ public class ModVillagers { public static final DeferredRegister POI_TYPES = DeferredRegister.create(ForgeRegistries.POI_TYPES, ModUtils.MODID); public static final DeferredRegister VILLAGER_PROFESSIONS = DeferredRegister.create(ForgeRegistries.VILLAGER_PROFESSIONS, ModUtils.MODID); - public static final RegistryObject ARMS_DEALER_POI = POI_TYPES.register("arms_dealer", + public static final RegistryObject ARMORY_POI = POI_TYPES.register("armory", () -> new PoiType(ImmutableSet.copyOf(ModBlocks.REFORGING_TABLE.get().getStateDefinition().getPossibleStates()), 1, 1)); - public static final RegistryObject ARMS_DEALER = VILLAGER_PROFESSIONS.register("arms_dealer", - () -> new VillagerProfession("arms_dealer", holder -> holder.get() == ARMS_DEALER_POI.get(), holder -> holder.get() == ARMS_DEALER_POI.get(), + public static final RegistryObject ARMORY = VILLAGER_PROFESSIONS.register("armory", + () -> new VillagerProfession("armory", holder -> holder.get() == ARMORY_POI.get(), holder -> holder.get() == ARMORY_POI.get(), ImmutableSet.of(), ImmutableSet.of(), null)); public static void register(IEventBus eventBus) { @@ -38,15 +38,210 @@ public class ModVillagers { @SubscribeEvent public static void addCustomTrades(VillagerTradesEvent event) { - if (event.getType() == ModVillagers.ARMS_DEALER.get()) { + if (event.getType() == ModVillagers.ARMORY.get()) { Int2ObjectMap> trades = event.getTrades(); - trades.get(1).add(((pTrader, pRandom) -> new MerchantOffer(new ItemStack(Items.EMERALD, 10), - new ItemStack(ModItems.HANDGUN_AMMO_BOX.get(), 1), 5, 1, 0.05f))); - trades.get(1).add(((pTrader, pRandom) -> new MerchantOffer(new ItemStack(Items.EMERALD, 12), - new ItemStack(ModItems.RIFLE_AMMO_BOX.get(), 1), 5, 1, 0.05f))); - trades.get(1).add(((pTrader, pRandom) -> new MerchantOffer(new ItemStack(ModItems.TASER_BLUEPRINT.get(), 1), - new ItemStack(Items.EMERALD, 1), 10, 1, 0.05f))); + + trades.get(1).add(new BasicItemListing(new ItemStack(ModItems.TASER_BLUEPRINT.get()), + new ItemStack(Items.EMERALD,2), 16, 5, 0.05f)); +//单买子弹 + trades.get(1).add(new BasicItemListing(new ItemStack(Items.EMERALD, 1), + new ItemStack(ModItems.HANDGUN_AMMO.get(),4), 16, 1, 0.05f)); + trades.get(1).add(new BasicItemListing(new ItemStack(Items.EMERALD, 1), + new ItemStack(ModItems.RIFLE_AMMO.get(),3), 16, 1, 0.05f)); + trades.get(1).add(new BasicItemListing(new ItemStack(Items.EMERALD, 1), + new ItemStack(ModItems.SHOTGUN_AMMO.get(),2), 16, 1, 0.05f)); + trades.get(1).add(new BasicItemListing(new ItemStack(Items.EMERALD, 1), + new ItemStack(ModItems.SHOTGUN_AMMO.get(),2), 16, 1, 0.05f)); +//单卖子弹 + trades.get(1).add(new BasicItemListing(new ItemStack(ModItems.HANDGUN_AMMO.get(),8), + new ItemStack(Items.EMERALD,1), 32, 2, 0.05f)); + trades.get(1).add(new BasicItemListing(new ItemStack(ModItems.RIFLE_AMMO.get(),6), + new ItemStack(Items.EMERALD,1), 32, 2, 0.05f)); + trades.get(1).add(new BasicItemListing(new ItemStack(ModItems.SNIPER_AMMO.get(),4), + new ItemStack(Items.EMERALD,1), 32, 2, 0.05f)); + trades.get(1).add(new BasicItemListing(new ItemStack(ModItems.SHOTGUN_AMMO.get(),4), + new ItemStack(Items.EMERALD,1), 32, 2, 0.05f)); + + + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 10), + new ItemStack(ModItems.STEEL_ACTION.get()), 12, 5, 0.05f)); + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), + new ItemStack(ModItems.STEEL_BARREL.get()), 12, 5, 0.05f)); + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 6), + new ItemStack(ModItems.STEEL_TRIGGER.get()), 12, 5, 0.05f)); + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), + new ItemStack(ModItems.STEEL_SPRING.get()), 12, 5, 0.05f)); + + + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + new ItemStack(ModItems.MARLIN_BLUEPRINT.get()), 8, 50, 0.05f)); + + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + new ItemStack(ModItems.GLOCK_17_BLUEPRINT.get()), 8, 50, 0.05f)); + + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + new ItemStack(ModItems.M_1911_BLUEPRINT.get()), 8, 50, 0.05f)); + + trades.get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + new ItemStack(ModItems.TASER_BLUEPRINT.get()), 8, 50, 0.05f)); + +//买盒装子弹 + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 3), + new ItemStack(ModItems.HANDGUN_AMMO_BOX.get(),2), 8, 5, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2), + new ItemStack(ModItems.RIFLE_AMMO_BOX.get(),1), 8, 5, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 3), + new ItemStack(ModItems.SHOTGUN_AMMO_BOX.get(),1), 8, 5, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 3), + new ItemStack(ModItems.SHOTGUN_AMMO_BOX.get(),1), 8, 5, 0.05f)); +//卖盒装子弹 + trades.get(3).add(new BasicItemListing(new ItemStack(ModItems.HANDGUN_AMMO_BOX.get(),4), + new ItemStack(Items.EMERALD,3), 16, 5, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(ModItems.RIFLE_AMMO_BOX.get(),1), + new ItemStack(Items.EMERALD,1), 16, 5, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(ModItems.SNIPER_AMMO_BOX.get(),2), + new ItemStack(Items.EMERALD,3), 16, 5, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(ModItems.SHOTGUN_AMMO_BOX.get(),2), + new ItemStack(Items.EMERALD,3), 16, 5, 0.05f)); + + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + new ItemStack(ModItems.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), + new ItemStack(ModItems.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + new ItemStack(ModItems.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), + new ItemStack(ModItems.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); + + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.GLOCK_18_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.SKS_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.M_870_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), + new ItemStack(ModItems.K_98_BLUEPRINT.get()), 10, 50, 0.05f)); + + trades.get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 40), + new ItemStack(ModItems.MOSIN_NAGANT_BLUEPRINT.get()), 10, 50, 0.05f)); + + + trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2), + new ItemStack(ModItems.GRENADE_40MM.get(),1), 16, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2), + new ItemStack(ModItems.HAND_GRENADE.get(),1), 16, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2), + new ItemStack(ModItems.RGO_GRENADE.get(),1), 16, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 3), + new ItemStack(ModItems.MORTAR_SHELLS.get(),1), 16, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 4), + new ItemStack(ModItems.CLAYMORE_MINE.get(),1), 16, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 4), + new ItemStack(ModItems.ROCKET.get(),1), 16, 5, 0.05f)); + + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.GRENADE_40MM.get(),1), + new ItemStack(Items.EMERALD,1), 32, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.HAND_GRENADE.get(),1), + new ItemStack(Items.EMERALD,1), 32, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.RGO_GRENADE.get(),1), + new ItemStack(Items.EMERALD,1), 32, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.MORTAR_SHELLS.get(),3), + new ItemStack(Items.EMERALD,2), 32, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.CLAYMORE_MINE.get(),1), + new ItemStack(Items.EMERALD,2), 32, 5, 0.05f)); + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.ROCKET.get(),1), + new ItemStack(Items.EMERALD,2), 32, 5, 0.05f)); + + +// trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), +// new ItemStack(new PerkItem(ModPerks.POISONOUS_BULLET),1), 16, 1, 0.05f)); +// +// trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), +// new ItemStack(new PerkItem(ModPerks.SUBSISTENCE),1), 16, 1, 0.05f)); +// +// trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), +// new ItemStack(new PerkItem(ModPerks.KILL_CLIP),1), 16, 1, 0.05f)); +// +// trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), +// new ItemStack(new PerkItem(ModPerks.GUTSHOT_STRAIGHT),1), 16, 1, 0.05f)); +// +// trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), +// new ItemStack(new PerkItem(ModPerks.HEAD_SEEKER),1), 16, 1, 0.05f)); +// +// +// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 24), +// new ItemStack(new PerkItem(ModPerks.SILVER_BULLET),1), 16, 1, 0.05f)); +// +// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), +// new ItemStack(new PerkItem(ModPerks.FIELD_DOCTOR),1), 16, 1, 0.05f)); +// +// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 24), +// new ItemStack(new PerkItem(ModPerks.HEAL_CLIP),1), 16, 1, 0.05f)); +// +// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), +// new ItemStack(new PerkItem(ModPerks.KILLING_TALLY),1), 16, 1, 0.05f)); +// +// trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 14), +// new ItemStack(new PerkItem(ModPerks.FOURTH_TIMES_CHARM),1), 16, 1, 0.05f)); + + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), + new ItemStack(ModItems.QBZ_95_BLUEPRINT.get()), 10, 80, 0.05f)); + + trades.get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), + 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(ModItems.HE_5_INCHES.get(),1), + new ItemStack(Items.EMERALD,8), 32, 2, 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)); } } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 66bdd009c..89113dcba 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -327,7 +327,7 @@ "des.superbwarfare.shoot.rings": "Rings ", - "entity.minecraft.villager.superbwarfare.arms_dealer": "Arms Dealer", + "entity.minecraft.villager.superbwarfare.armory": "Armory", "container.superbwarfare.reforging_table": "Gun Reforge Table" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 56c216997..c49aaba12 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -327,7 +327,7 @@ "des.superbwarfare.shoot.rings": "环 ", - "entity.minecraft.villager.superbwarfare.arms_dealer": "军火商", + "entity.minecraft.villager.superbwarfare.armory": "军械师", "container.superbwarfare.reforging_table": "枪械重铸台" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/entity/villager/profession/armory.png b/src/main/resources/assets/superbwarfare/textures/entity/villager/profession/armory.png new file mode 100644 index 0000000000000000000000000000000000000000..2c10f598adac97da621dbead2861d3d90fe2f1c3 GIT binary patch literal 3088 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/textures/entity/villager/profession/arms_dealer.png b/src/main/resources/assets/superbwarfare/textures/entity/villager/profession/arms_dealer.png deleted file mode 100644 index f69c4227fc9565280138f1fb5085311e808b7a34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2993 zcmV;i3r_TjP)qhYAWRl|Y3+Q9)1;ppvRIzQvB6^{$<@cfG#E-ko!Jn4R&=UhE`Z*P-Mu zt#{6x^L=~1?|heYvtSE6dEYU;S^d$YH`T4Xlw0P+H+~?t`i;%-@MFjIkz^lADFB2J z2q93mVtP2mh^_McPGhpqAlcf1(i+pSutFwUYbLU@48;;y zmdWIsQ(pVt!wDxVluAtH=IL$k#E=rxG62EMXu8}+ksiwckUZ2wsZ>G;NoIVO#84c= zG#E*zc0ULn=TcSMq zqxGxr4bTV;LMxV@{X0@RG|_M?ZcE#u0;M!U2&5F%E^zedOn+^5v5n z;LIBtgn+gdNcQ%i690&o<2%|MO+|Z3cptMHW3MnNQ zMjXXRDUnicSb*E%AARu?-srmmxQaRT=)C|{Wk3BFe)!9(4*D(2<>{6eRp^QZuEg5f zIsm`@{V;dmowRrb@;9$pZ~jND00{Sw1_*KX?7TOL7N?(hM6cv>>D-~GD-(SDoa@o@b_C#qjyea|gA8jX78s}UZ` z3UEiHUdP6!COv`u?Hg=pgO*TEIV%YGe#(6si>P#5X@1FqOajB^#)J;lE?$&b7P>rZQG>BX6Zeg@ZJ>)OWt$yo;@rtuVRHv7N&DmCrL6@$N`l1 z+3}wJWq?#6=Y9O|0G8L*yiaFq3!SYkScZWiCC~oi4*}sV)4(!~DmwRLNQsof`_#f{ zW`@zs3`!}A#Uio6C|YX@g{6S-02A|b2;s;SPIgrBGLvo2A|=unW??$#oV=7H=xQNH zvdwv)>ZB-s|`?`vZ+9%bIzLamr@9WxF(6gQ(VP!fxQcO=lJY47@D#FEEYW0bgc8>UB5ixU zj=LvVe&H(V){3RT@4NL%X^OV(wH=Jcc@3wtN@=?HN0Cynx_XJsN`d&^prEE{(AySf zzQUrtdRH)fbgq!DHTV_cDkD;E+hmzlo%ajWWSLl|;g$VuYtgxa)q<3Q^jL<^+;xES z3t6UeS@uPuWX9*5Ah^^-Tf8+uQ!17yT)IR@vK>Pj)ja(p?f>>arwX}1T<}{$r4UV) z85r40fm}DJY~!aZ+ICe(T^_N)Zj{pWhr1Yz#weAFgnK(^&O@_Z?N;mS>+H2G?2_#r zu?H033b@*_VeT&cqwiXS-#TguQYn-xkl+97wR7RNRZ4qq<0?gKMfUtW7bl$=YO0V& zYfYptO#DE16>r;C30Z3H%9{^qdh7Ez;Z#Pz?Dl)^H zOxNsaJ9fQ0JoRjF&;G&tPwFFwJNe4je!45$X^%Z{ zTmu~2e`8>q{`5p}O;WGEYAvwyU4DD<%D?hgRQHZkKu@&wit65R3b<12`UQ!t@XU8U z7s!1VhG#Zyf9zNv0B@1Sy0woB!!w+oc!Oj6ZzNWDoe$l2O#5TP|C|N9HC1PdxJ6w( zm`^`>-&M^n{B*i}{H(NgZeeJR5OQPEqd^*yvDx&NyR>gNHg$m`hdX)j{*&5Gg>DM0 zf-avtYmKcyE5+ngA^1b#bq2e(f48^MXiN+!-@lp6W$A6(xYg-LUwbE|8q3_R@W4Yq zscA8f^RlmW+IxE8#oB!8wKr2E&JopSJE#xdfAX^3WPW;{)ehL#=d2VKE-VmEhEYmk zi26(7-GUiE;FzUWx@wOdU~HloC?7do%|vUM$j$)}>5IVh0t%Q6q3&VPLxvQQ+YZP9YlH~ z-sZ%$1atgc9tcr5zwCUE)t^h(hjYuTFtHK&wRS86LKIS4A5rZV%%KAv6xWL=r4T}5 z7y{F>Fbqj$fb^HO){M_NcX4BToV_$51kKG&WX{cjfUbR=2qCyQnI$&Z-H`kJjfOdU zZq7Sb>url5r9ozVmgJ$Hs?6Xo3n3WjjIzGwC{F{6=|vWSuKrFCU`UCOlAfWM_s>q( z8f5%H%-K@TgJBvNrVI!=Hk)Q_)){%%0^Ik8VG;^iET#(-(vJD}48@pUoX0c_CKoO; zk)1_K$;@abK!2^kGz>}NV7xqi6`olS#dQ#%9wD#hho;GD!@@(QMEk z=#C?V@Y=xU^Nd}G*3Qn5`+XhPaUIuj9sef~weHmdbjCN1#h&~2uLQt758tT))>hY8 zUR=db*V5|T#qCOL9GKZ98>3?W@AA4<5ZDlLg$GB-pMO8NedTukQ(rn>wPtje(tf&o n9==oi%XfeE#IF8>RxSJ&8y;TpEIzwA00000NkvXXu0mjfd}{5` diff --git a/src/main/resources/assets/superbwarfare/textures/entity/zombie_villager/profession/armory.png b/src/main/resources/assets/superbwarfare/textures/entity/zombie_villager/profession/armory.png new file mode 100644 index 0000000000000000000000000000000000000000..4a5545a46a9bcc49b8cf1295a80295aea21c5f9a GIT binary patch literal 3107 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 i}H_eE;K8~ z1lo4jJi|M>@@^7_^`03*W*q!5&@o(s{lle++H?d)}wH_+RI5jgFYjZsv}?dBJrdpOkI zaU4psD-^Ee{JL6g%m3bc?i}0OJ6I8u%3`(cCdn+;s^kabR2HiwM&baCGk5$lK(SW! zzvll~8)nMO0F0+H)a!N9W5Z~z z*=iU+i23zZ(&q-KELMrz!;wL`N259-ka^%$)*yL z?Bp&=YYgLH<->gK^-5`G%FEn%YXg7_&knP8tGOhP<_6pNMq)`8H`d8y+iB3q0mWLC z-if$g`3U+pODc`M;=?g1rng)fzIO~g5I>8SC0(`*`@WLSIDaBe9Z)?En+toGBCx$7{t-48YtB1kNK#0e#+thY< ziRGgh(rA|%9O>X^@O!aVrLtIUj()%sT9xRr%+ScTD&*yc);2-Dy5qEU)RU1OOQDoz zG(N=Ga2ngL6EDQ*-GE-FJ*@Wk_vy1N9NY1)*h2>J6x@jsN`ydY^gVBAO^~gMv?}E( zWEt(&Z*AwnYpay@!^Sg;){3=T>)cszSE$9>23l(pBXKh0sW#b;qu5xkv9;2kAfb^1 zJTLIVpi}k_hCq_w*J_X;fAIUyemT=@ zRBC4KcN>W@SQkQ=K`M)G$Rt{X1(gWq2Foz~Y3#5$KFAkLu-=Sd zM4O}NY${~G#Ih~w#y-LjT{rmWoL+W~opu9wyS)X%p8(umYh!5A+_u|$dmS^oHw^|+ zcN}_T_o>h0^Xh}iGdOKJo2qFDN3-wjV=9x~jUE3Tfv;f1qQAetqw;Vc_5z0`MNhfl zLa5V>0O6_hFxb+@iboI~a_ugil?O1p?eAaz-dFYH)H;9jgYcRC%P(EmSFa@b#PefpZF58l38Bhu$?cAP%>yiY!&^~bn$PN$O z6YUdcfP2N6KM?u;Uwti<)|aN14{ZPBlOq7UKrYn&?YlLMn8_1gd0Yo`!pF`7etWyi z67djPH<+(~@2kJpiBOPFH?E(R*6u3|tr0>t7d;xJA(>q%@!fA9?``i%KOdL_xr zFJ0H(ROn5CZP1OIXRUD*Xr)-VT?_wEe4nwQ<-)9!|?TQ{`g29ZLe zi09)dr7$`z(@q&?X54j4t#sQNJHYIGJygDWrCo^DFu&%$0Z5D_V6j4F!&N+*jk3J$ z?l4E=Lnqw*<3pC`R&X4LxjSWw(5bC6fq#f` zmSCnXrdXX{Wn?tL+C~MX9Hf-~Gqb0!Wx6tJtx-x*o^wZk_`(oEfE1GCXcDCq8^sM` zxfqE;!atliOEBkdZU7N#x3=BS+3suU?r=9HwfSb|*V^?Ah)^qb-;JF%%!%_egmI4Aa0cWk}K4l@hZn?#O!{;ME(3NhD&iS*lShx$d8xNVB-Pj%gSy zRPHdpwt|$B<(YDb|E$0?3`y=%rm=h#zFSYEv%caJ=`6+Rl5d#Vl@b$a_q%DC