Merge remote-tracking branch 'origin/dev' into 4.2

This commit is contained in:
mezz committed 2016-04-27 19:30:56 -07:00
commit b466e9ce4a
16 files changed
+107 -14

No files matched your search

@@ -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
+26 -2
View File
@@ -211,7 +211,31 @@ public enum Fluids {
@Override
public EnumSet<EnumContainerType> 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<EnumContainerType> 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<String, Fluids> tagToFluid = new HashMap<>();
@@ -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) {
@@ -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;
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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});
}
}
}
@@ -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), 10, 0.1f, true);
public static final EnumBeverage[] VALUES = values();
private final String name;
@@ -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;
@@ -49,7 +50,7 @@ public class ItemBeverage extends ItemForestryFood {
public ItemBeverage() {
super(1, 0.2f);
setMaxStackSize(1);
setMaxStackSize(8);
this.beverages = EnumBeverage.VALUES;
}
@@ -64,11 +65,18 @@ public class ItemBeverage extends ItemForestryFood {
@Override
public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) {
List<IBeverageEffect> 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 (world.isRemote) {
return itemstack;
}
@@ -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
@@ -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) {
@@ -67,12 +67,20 @@ public class PluginPlantMegaPack extends ForestryPlugin {
ImmutableList<String> landCropPlant = ImmutableList.of(
"Beet",
"BellPepperOrange",
"BellPepperRed",
"BellPepperYellow",
"Broccoli",
"Cassava",
"Celery",
"Corn",
"Cucumber",
"Eggplant",
"GreenBean",
"Leek",
"Lettuce",
"Onion",
"Sorrel",
"Spinach",
"Tomato"
);