diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index f0e7d63b4..7a757c02b 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -281,12 +281,6 @@ public class PluginApiculture extends BlankForestryPlugin { ItemStack monasticDrone = BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE); ItemStack endDrone = BeeDefinition.ENDED.getMemberStack(EnumBeeType.DRONE); ItemStack propolis = new ItemStack(PluginApiculture.items.propolis,1); - ItemStack forestDrone = BeeDefinition.FOREST.getMemberStack(EnumBeeType.DRONE); - ItemStack meadowsDrone = BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.DRONE); - ItemStack modestDrone = BeeDefinition.MODEST.getMemberStack(EnumBeeType.DRONE); - ItemStack tropicalDrone = BeeDefinition.TROPICAL.getMemberStack(EnumBeeType.DRONE); - ItemStack wintryDrone = BeeDefinition.WINTRY.getMemberStack(EnumBeeType.DRONE); - ItemStack marshyDrone = BeeDefinition.MARSHY.getMemberStack(EnumBeeType.DRONE); VillagerRegistry.VillagerCareer apiaristCareer = new VillagerRegistry.VillagerCareer(villagerApiarist, "apiarist"); apiaristCareer.addTrade(1, @@ -296,17 +290,12 @@ public class PluginApiculture extends BlankForestryPlugin { ); apiaristCareer.addTrade(2, new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 4), new ItemStack(items.smoker), null), - new VillagerTradeLists.GiveItemForLogsAndEmeralds(apiary, new EntityVillager.PriceInfo(1, 1), new EntityVillager.PriceInfo(16, 32), new EntityVillager.PriceInfo(1, 2)) + new VillagerTradeLists.GiveItemForLogsAndEmeralds(apiary, new EntityVillager.PriceInfo(1, 1), new EntityVillager.PriceInfo(16, 32), new EntityVillager.PriceInfo(1, 2)), + new VillagerApiaristTrades.GiveRandomHiveDroneForItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4)) ); apiaristCareer.addTrade(3, new VillagerTradeLists.GiveEmeraldForItems(wildcardPrincess, null), - new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 2), provenFrames, new EntityVillager.PriceInfo(1, 6)), - new VillagerTradeLists.GiveItemForTwoItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4), forestDrone, null), - new VillagerTradeLists.GiveItemForTwoItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4), meadowsDrone, null), - new VillagerTradeLists.GiveItemForTwoItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4), modestDrone, null), - new VillagerTradeLists.GiveItemForTwoItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4), tropicalDrone, null), - new VillagerTradeLists.GiveItemForTwoItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4), wintryDrone, null), - new VillagerTradeLists.GiveItemForTwoItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4), marshyDrone, null) + new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 2), provenFrames, new EntityVillager.PriceInfo(1, 6)) ); apiaristCareer.addTrade(4, new VillagerTradeLists.GiveItemForItemAndEmerald(wildcardPrincess, null, new EntityVillager.PriceInfo(10, 64), monasticDrone, null), diff --git a/src/main/java/forestry/apiculture/VillagerApiaristTrades.java b/src/main/java/forestry/apiculture/VillagerApiaristTrades.java index 79e6c4dcb..73bd2c631 100644 --- a/src/main/java/forestry/apiculture/VillagerApiaristTrades.java +++ b/src/main/java/forestry/apiculture/VillagerApiaristTrades.java @@ -9,6 +9,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; +import forestry.api.apiculture.EnumBeeType; +import forestry.apiculture.genetics.BeeDefinition; + public class VillagerApiaristTrades { public static class GiveRandomCombsForItems implements EntityVillager.ITradeList { @@ -42,5 +45,46 @@ public class VillagerApiaristTrades { recipeList.add(new MerchantRecipe(itemToBuy, randomComb)); } } + public static class GiveRandomHiveDroneForItems implements EntityVillager.ITradeList { + @Nonnull + public ItemStack buyingItemStack; + @Nullable + public EntityVillager.PriceInfo buyingPriceInfo; + @Nonnull + public ItemStack buyingItemStackTwo; + @Nullable + public EntityVillager.PriceInfo buyingPriceItemTwoInfo; + public GiveRandomHiveDroneForItems( + @Nonnull ItemStack buyingItemStack, + @Nullable EntityVillager.PriceInfo buyingPriceInfo, + @Nonnull ItemStack buyingItemStackTwo, + @Nullable EntityVillager.PriceInfo buyingPriceItemTwoInfo) { + this.buyingItemStack = buyingItemStack; + this.buyingPriceInfo = buyingPriceInfo; + this.buyingItemStackTwo = buyingItemStackTwo; + this.buyingPriceItemTwoInfo = buyingPriceItemTwoInfo; + } + + @Override + public void modifyMerchantRecipeList(@Nonnull MerchantRecipeList recipeList, @Nonnull Random random) { + + int buyAmount = 1; + if (this.buyingPriceInfo != null) { + buyAmount = this.buyingPriceInfo.getPrice(random); + } + + int buyTwoAmount = 1; + if (this.buyingPriceItemTwoInfo != null) { + buyTwoAmount = this.buyingPriceItemTwoInfo.getPrice(random); + } + BeeDefinition [] forestryMundane = new BeeDefinition[] { BeeDefinition.FOREST, BeeDefinition.MEADOWS, BeeDefinition.MODEST, BeeDefinition.WINTRY, BeeDefinition.TROPICAL, BeeDefinition.MARSHY }; + ItemStack randomHiveDrone = forestryMundane[random.nextInt(forestryMundane.length)].getMemberStack(EnumBeeType.DRONE); + ItemStack buyItemStack = this.buyingItemStack.copy(); + buyItemStack.stackSize = buyAmount; + ItemStack buyItemStackTwo = this.buyingItemStackTwo.copy(); + buyItemStackTwo.stackSize = buyTwoAmount; + recipeList.add(new MerchantRecipe(buyItemStack, buyItemStackTwo, randomHiveDrone)); + } + } } diff --git a/src/main/java/forestry/core/utils/VillagerTradeLists.java b/src/main/java/forestry/core/utils/VillagerTradeLists.java index 6a1b832e9..0c1495601 100644 --- a/src/main/java/forestry/core/utils/VillagerTradeLists.java +++ b/src/main/java/forestry/core/utils/VillagerTradeLists.java @@ -182,7 +182,7 @@ public class VillagerTradeLists { @Nonnull public ItemStack buyingItemStackTwo; @Nullable - public EntityVillager.PriceInfo buyingItemTwoInfo; + public EntityVillager.PriceInfo buyingPriceItemTwoInfo; @Nonnull public ItemStack sellingItemstack; @Nullable @@ -192,13 +192,13 @@ public class VillagerTradeLists { @Nonnull ItemStack buyingItemStack, @Nullable EntityVillager.PriceInfo buyingPriceInfo, @Nonnull ItemStack buyingItemStackTwo, - @Nullable EntityVillager.PriceInfo buyingItemTwoInfo, + @Nullable EntityVillager.PriceInfo buyingPriceItemTwoInfo, @Nonnull ItemStack sellingItemstack, @Nullable EntityVillager.PriceInfo sellingPriceInfo) { this.buyingItemStack = buyingItemStack; this.buyingPriceInfo = buyingPriceInfo; this.buyingItemStackTwo = buyingItemStackTwo; - this.buyingItemTwoInfo = buyingItemTwoInfo; + this.buyingPriceItemTwoInfo = buyingPriceItemTwoInfo; this.sellingItemstack = sellingItemstack; this.sellingPriceInfo = sellingPriceInfo; } @@ -211,8 +211,8 @@ public class VillagerTradeLists { } int buyTwoAmount = 1; - if (this.buyingItemTwoInfo != null) { - buyTwoAmount = this.buyingItemTwoInfo.getPrice(random); + if (this.buyingPriceItemTwoInfo != null) { + buyTwoAmount = this.buyingPriceItemTwoInfo.getPrice(random); } int sellAmount = 1;