From 98c56973db73b0b00ca1dee6fca7f5f07701de46 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Thu, 31 Mar 2016 09:40:18 -0500 Subject: [PATCH 1/8] Fix #1123 Add lang string for Leporine Bee, Add some basic bee trades to Aparist. --- lang | 2 +- .../apiculture/VillageHandlerApiculture.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lang b/lang index cb5900228..c56c2c386 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit cb5900228ed0e4ec7a8a16aa69dc329c1a11afb9 +Subproject commit c56c2c386dc11c997212db64ebe4a2e5683a1766 diff --git a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java index c955ba5d2..0aeef7733 100755 --- a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java @@ -49,6 +49,7 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { ItemStack wildcardPrincess = new ItemStack(PluginApiculture.items.beePrincessGE, 1, OreDictionary.WILDCARD_VALUE); + ItemStack wildcardDrone = new ItemStack(PluginApiculture.items.beeDroneGE, 4, OreDictionary.WILDCARD_VALUE); recipeList.add(new MerchantRecipe(wildcardPrincess, new ItemStack(Items.emerald, 1))); ItemStack randomComb = PluginApiculture.items.beeComb.getRandomComb(1, random, false); @@ -62,6 +63,23 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla ItemStack monasticDrone = BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE); recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), wildcardPrincess, monasticDrone)); + + ItemStack endDrone = BeeDefinition.ENDED.getMemberStack(EnumBeeType.DRONE); + recipeList.add(new MerchantRecipe(new ItemStack(Items.ender_eye, 16), wildcardPrincess, endDrone)); + + 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); + recipeList.add(new MerchantRecipe(propolis, wildcardDrone, forestDrone)); + recipeList.add(new MerchantRecipe(propolis, wildcardDrone, meadowsDrone)); + recipeList.add(new MerchantRecipe(propolis, wildcardDrone, modestDrone)); + recipeList.add(new MerchantRecipe(propolis, wildcardDrone, tropicalDrone)); + recipeList.add(new MerchantRecipe(propolis, wildcardDrone, wintryDrone)); + recipeList.add(new MerchantRecipe(propolis, wildcardDrone, marshyDrone)); } @Override From 97bfbe221318714372a9cd272dfc84fc5fba6d3a Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Sun, 3 Apr 2016 11:17:30 -0500 Subject: [PATCH 2/8] Fix #1117 Radioactive bee effect can bypass apiarist suit --- .../apiculture/genetics/alleles/AlleleEffectRadioactive.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java index 45b7980c4..634a9b88f 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java @@ -49,7 +49,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled { // Entities are not attacked if they wear a full set of apiarist's armor. int count = BeeManager.armorApiaristHelper.wearsItems(entity, getUID(), true); - damage -= count; + damage -= (count * 2); if (damage <= 0) { continue; } From 2a025254a0a03454c9bb4044806c075fd86e8d7f Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Tue, 5 Apr 2016 16:08:00 -0500 Subject: [PATCH 3/8] Add ic2 industrial fert as farming fertilizer. (seperate config option to probably come later) --- .../forestry/farming/multiblock/InventoryFarm.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/farming/multiblock/InventoryFarm.java b/src/main/java/forestry/farming/multiblock/InventoryFarm.java index cfc5d4675..a5c58c683 100644 --- a/src/main/java/forestry/farming/multiblock/InventoryFarm.java +++ b/src/main/java/forestry/farming/multiblock/InventoryFarm.java @@ -31,6 +31,9 @@ import forestry.core.utils.InventoryUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.SlotUtil; import forestry.plugins.PluginCore; +import forestry.plugins.PluginManager; + +import ic2.api.item.IC2Items; public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory { public static final int SLOT_RESOURCES_1 = 0; @@ -132,8 +135,14 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn if (itemstack == null) { return false; } - Item item = itemstack.getItem(); + if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { + Item ic2fert = IC2Items.getItem("fertilizer").getItem(); + if (ic2fert == item) { + return true; + } + } + return PluginCore.items.fertilizerCompound == item; } From 3967d21b066315486b800cb5947506d1edbf5b91 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Sun, 17 Apr 2016 01:40:45 -0500 Subject: [PATCH 4/8] Short mead now has a purpose, further distillation produces mead (only drinkable in bottles). Also fix somehow eating it glass bottle and all. --- lang | 2 +- .../java/forestry/core/fluids/Fluids.java | 28 ++++++++++++++++-- .../forestry/food/items/EnumBeverage.java | 4 +-- .../forestry/food/items/ItemBeverage.java | 5 +++- .../forestry/plugins/PluginApiculture.java | 2 ++ .../java/forestry/plugins/PluginFood.java | 1 + .../textures/blocks/liquid/mead_still.png | Bin 0 -> 8291 bytes .../blocks/liquid/mead_still.png.mcmeta | 1 + 8 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png.mcmeta diff --git a/lang b/lang index c56c2c386..928f197a2 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit c56c2c386dc11c997212db64ebe4a2e5683a1766 +Subproject commit 928f197a21ee2fd866159c430ded0fddcf2bfb5c diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index 26fbd0392..79bbb74bd 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -211,7 +211,31 @@ public enum Fluids { @Override public EnumSet getContainerTypes() { return EnumSet.of( - EnumContainerType.BUCKET + EnumContainerType.BUCKET, + EnumContainerType.CAN, + EnumContainerType.CAPSULE, + EnumContainerType.REFRACTORY + ); + } + }, + MEAD("Mead", new Color(202, 102, 0), 1000, 1200) { + @Override + public String getTag() { + return "mead"; + } + + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + + @Override + public EnumSet getContainerTypes() { + return EnumSet.of( + EnumContainerType.BUCKET, + EnumContainerType.CAN, + EnumContainerType.CAPSULE, + EnumContainerType.REFRACTORY ); } }, @@ -260,7 +284,7 @@ public enum Fluids { CREOSOTE(new Color(0x635c03)), STEAM(new Color(0x91938F)); - public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD}; + public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD, MEAD}; private static final Map tagToFluid = new HashMap<>(); diff --git a/src/main/java/forestry/food/items/EnumBeverage.java b/src/main/java/forestry/food/items/EnumBeverage.java index 7f0c08751..98009c7ff 100644 --- a/src/main/java/forestry/food/items/EnumBeverage.java +++ b/src/main/java/forestry/food/items/EnumBeverage.java @@ -22,8 +22,8 @@ import forestry.core.render.TextureManager; public enum EnumBeverage implements ItemBeverage.IBeverageInfo { MEAD_SHORT("meadShort", "glass", new Color(0xec9a19), new Color(0xffffff), 1, 0.2f, true), - MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true); - + MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true), + MEAD("mead", "glass", new Color(0xcc6600), new Color(0xffffff), 8, 0.2f, true); public static final EnumBeverage[] VALUES = values(); private final String name; diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index a8d7d67b9..2c6783c6e 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -68,7 +69,9 @@ public class ItemBeverage extends ItemForestryFood { itemstack.stackSize--; entityplayer.getFoodStats().func_151686_a(this, itemstack); world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); - + if(itemstack.stackSize == 0) { + itemstack = new ItemStack(Items.glass_bottle, 1); + } if (world.isRemote) { return itemstack; } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 63668785a..727d59fc0 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -710,6 +710,8 @@ public class PluginApiculture extends ForestryPlugin { // / FERMENTER RecipeManagers.fermenterManager.addRecipe(items.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.HONEY.getFluid(1)); + // / STILL + RecipeManagers.stillManager.addRecipe(Constants.STILL_DESTILLATION_DURATION, Fluids.SHORT_MEAD.getFluid(10), Fluids.MEAD.getFluid(5)); } // ANALYZER diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index 61f3c179e..ee301304c 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -50,6 +50,7 @@ public class PluginFood extends ForestryPlugin { super.preInit(); LiquidRegistryHelper.registerLiquidContainer(Fluids.SHORT_MEAD, Constants.BUCKET_VOLUME, items.beverage.get(EnumBeverage.MEAD_SHORT, 1), new ItemStack(Items.glass_bottle)); + LiquidRegistryHelper.registerLiquidContainer(Fluids.MEAD, Constants.BUCKET_VOLUME, items.beverage.get(EnumBeverage.MEAD, 1), new ItemStack(Items.glass_bottle)); ItemRegistryApiculture beeItems = PluginApiculture.items; if (beeItems != null) { diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png b/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png new file mode 100644 index 0000000000000000000000000000000000000000..ee2f4e8216fc18de7322886ea94e6d018519ad06 GIT binary patch literal 8291 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 h0$9Y{uU~w8^S`|k=g Date: Sun, 17 Apr 2016 18:46:52 -0500 Subject: [PATCH 5/8] Fix eating bottles slightly better, Steve now enjoys mead in 8packs (hic). --- src/main/java/forestry/food/items/EnumBeverage.java | 2 +- src/main/java/forestry/food/items/ItemBeverage.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/food/items/EnumBeverage.java b/src/main/java/forestry/food/items/EnumBeverage.java index 98009c7ff..7dfe47ab8 100644 --- a/src/main/java/forestry/food/items/EnumBeverage.java +++ b/src/main/java/forestry/food/items/EnumBeverage.java @@ -23,7 +23,7 @@ import forestry.core.render.TextureManager; public enum EnumBeverage implements ItemBeverage.IBeverageInfo { MEAD_SHORT("meadShort", "glass", new Color(0xec9a19), new Color(0xffffff), 1, 0.2f, true), MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true), - MEAD("mead", "glass", new Color(0xcc6600), new Color(0xffffff), 8, 0.2f, true); + MEAD("mead", "glass", new Color(0xcc6600), new Color(0xffffff), 10, 0.1f, true); public static final EnumBeverage[] VALUES = values(); private final String name; diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index 2c6783c6e..29c90af85 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -50,7 +50,7 @@ public class ItemBeverage extends ItemForestryFood { public ItemBeverage() { super(1, 0.2f); - setMaxStackSize(1); + setMaxStackSize(8); this.beverages = EnumBeverage.VALUES; } @@ -65,13 +65,18 @@ public class ItemBeverage extends ItemForestryFood { @Override public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { List effects = BeverageEffect.loadEffects(itemstack); + ItemStack container = new ItemStack(Items.glass_bottle, 1); itemstack.stackSize--; + if (!entityplayer.inventory.addItemStackToInventory(container)) { + entityplayer.dropPlayerItemWithRandomChoice(container, false); + } else { + entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, container); + } + entityplayer.inventory.markDirty(); + entityplayer.getFoodStats().func_151686_a(this, itemstack); world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); - if(itemstack.stackSize == 0) { - itemstack = new ItemStack(Items.glass_bottle, 1); - } if (world.isRemote) { return itemstack; } From 66561ac66d1e258c987b3d3e9550b4c62f75c7c8 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Mon, 18 Apr 2016 17:28:37 -0500 Subject: [PATCH 6/8] Fix #1129 Bugfixes for Multifarm BC Gate Triggers. --- .../java/forestry/core/utils/InventoryUtil.java | 16 ++++++++++++++++ .../farming/triggers/TriggerLowFertilizer.java | 2 +- .../farming/triggers/TriggerLowGermlings.java | 2 +- .../farming/triggers/TriggerLowSoil.java | 12 +++++++++--- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java index 101a46623..ea853ed63 100644 --- a/src/main/java/forestry/core/utils/InventoryUtil.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -407,6 +407,22 @@ public abstract class InventoryUtil { return ((float) amount / (float) stackMax) >= percent; } + public static boolean containsAmount(IInventory inventory, int amount) { + int total = 0; + int slot1 = 0; + int length = inventory.getSizeInventory(); + for (ItemStack itemStack : getStacks(inventory, slot1, length)) { + if (itemStack == null) { + continue; + } + total += itemStack.stackSize; + if (total >= amount) { + return true; + } + } + return false; + } + public static boolean isEmpty(IInventory inventory, int slotStart, int slotCount) { for (int i = slotStart; i < slotStart + slotCount; i++) { if (inventory.getStackInSlot(i) != null) { diff --git a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java index 09ae52748..5017e140e 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java @@ -44,6 +44,6 @@ public class TriggerLowFertilizer extends Trigger { TileFarmHatch tileHatch = (TileFarmHatch) tile; IInventory fertilizerInventory = tileHatch.getMultiblockLogic().getController().getFarmInventory().getFertilizerInventory(); - return InventoryUtil.containsPercent(fertilizerInventory, threshold); + return !InventoryUtil.containsPercent(fertilizerInventory, threshold); } } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java index 4759ff32e..890edf293 100644 --- a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java @@ -47,6 +47,6 @@ public class TriggerLowGermlings extends Trigger { TileFarmHatch tileHatch = (TileFarmHatch) tile; IInventory germlingsInventory = tileHatch.getMultiblockLogic().getController().getFarmInventory().getGermlingsInventory(); - return InventoryUtil.containsPercent(germlingsInventory, threshold); + return !InventoryUtil.containsPercent(germlingsInventory, threshold); } } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java index 5b7d3e366..26516be79 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java @@ -24,6 +24,7 @@ import forestry.farming.tiles.TileFarmHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementParameterItemStack; public class TriggerLowSoil extends Trigger { @@ -49,6 +50,11 @@ public class TriggerLowSoil extends Trigger { return 0; } + @Override + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); + } + /** * Return true if the tile given in parameter activates the trigger, given * the parameters. @@ -67,14 +73,14 @@ public class TriggerLowSoil extends Trigger { TileFarmHatch tileHatch = (TileFarmHatch) tile; IFarmController farmController = tileHatch.getMultiblockLogic().getController(); IFarmInventory farmInventory = farmController.getFarmInventory(); + IInventory resourcesInventory = farmInventory.getResourcesInventory(); if (parameter == null || parameter.getItemStack() == null) { - IInventory resourcesInventory = farmInventory.getResourcesInventory(); - return InventoryUtil.containsPercent(resourcesInventory, threshold); + return !InventoryUtil.containsAmount(resourcesInventory, threshold); } else { ItemStack filter = parameter.getItemStack().copy(); filter.stackSize = threshold; - return farmInventory.hasResources(new ItemStack[]{filter}); + return !InventoryUtil.contains(resourcesInventory, new ItemStack[]{filter}); } } } From f16f349f1090c852d68160f3506063a3053b9291 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Sun, 24 Apr 2016 14:32:05 -0500 Subject: [PATCH 7/8] Version bump to be ahead of stable, and pull in lang fixes --- gradle.properties | 2 +- lang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8b5ef7ef6..a37096aa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.4.1566-1.7.10 version_major=4 version_minor=2 -version_patch=10 +version_patch=12 diff --git a/lang b/lang index 928f197a2..b5ac4e0d6 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 928f197a21ee2fd866159c430ded0fddcf2bfb5c +Subproject commit b5ac4e0d6cde3f48a37d8f4f4b515710347b2cf4 From d734ca55e68fb437d6b3880ac43c32b69c303fa9 Mon Sep 17 00:00:00 2001 From: ultrasn0w Date: Mon, 25 Apr 2016 21:15:47 +0200 Subject: [PATCH 8/8] Update PlantMegaPack Plugin --- .../java/forestry/plugins/compat/PluginPlantMegaPack.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java index ba201a4bb..3797021f8 100644 --- a/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java +++ b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java @@ -67,12 +67,20 @@ public class PluginPlantMegaPack extends ForestryPlugin { ImmutableList landCropPlant = ImmutableList.of( "Beet", + "BellPepperOrange", + "BellPepperRed", "BellPepperYellow", + "Broccoli", + "Cassava", "Celery", "Corn", "Cucumber", + "Eggplant", + "GreenBean", + "Leek", "Lettuce", "Onion", + "Sorrel", "Spinach", "Tomato" );