Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

52 files changed, 4676 insertions, 2248 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
new file mode 100644
index 0000000000..01d5ef88c8
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
@@ -0,0 +1,669 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.gui.basic.GT_Container_CropHarvestor;
+import gtPlusPlus.xmod.gregtech.api.gui.basic.GT_GUIContainer_CropHarvestor;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import ic2.api.crops.CropCard;
+import ic2.api.crops.ICropTile;
+import ic2.core.item.DamageHandler;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
+public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank {
+
+	protected String mLocalName;
+
+	private static final int SLOT_WEEDEX_1 = 1;
+	private static final int SLOT_WEEDEX_2 = 2;
+	private static final int SLOT_FERT_1 = 3;
+	private static final int SLOT_FERT_4 = 6;
+	private static final int SLOT_OUTPUT_START = 7;
+
+	public boolean mModeAlternative = false;
+
+	public GT_MetaTileEntity_CropHarvestor(final int aID, final int aTier, final String aDescription) {
+		super(aID, "basicmachine.cropharvester.0"+aTier, "Crop Manager ("+GT_Values.VN[aTier]+")", aTier, 21, aDescription);
+		mLocalName = "Crop Manager ("+GT_Values.VN[aTier]+")";
+	}
+
+	public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+		super(aName, aTier, 21, aDescription, aTextures);
+		mLocalName = "Crop Manager ("+GT_Values.VN[aTier]+")";
+	}
+
+	@Override
+	public Object getServerGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_Container_CropHarvestor(aPlayerInventory, aBaseMetaTileEntity);
+	}
+
+	@Override
+	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_GUIContainer_CropHarvestor(aPlayerInventory, aBaseMetaTileEntity, mLocalName);
+	}
+
+	@Override
+	public boolean isTransformerUpgradable() {
+		return true;
+	}
+
+	@Override
+	public boolean isOverclockerUpgradable() {
+		return true;
+	}
+
+	@Override
+	public boolean isSimpleMachine() {
+		return true;
+	}	
+
+	@Override
+	public boolean isAccessAllowed(EntityPlayer aPlayer) {
+		return true;
+	}
+
+	@Override
+	public boolean isInputFacing(byte aSide) {
+		return true;
+	}
+
+	@Override
+	public boolean isEnetInput() {
+		return true;
+	}
+
+	@Override
+	public boolean isElectric() {
+		return true;
+	}
+
+	@Override
+	public long maxAmperesIn() {
+		return 8;
+	}
+
+	@Override
+	public long getMinimumStoredEU() {
+		return GT_Values.V[this.mTier];
+	}
+
+	@Override
+	public long maxEUStore() {
+		return GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]);
+	}
+
+	@Override
+	public long maxEUInput() {
+		return GT_Values.V[mTier];
+	}
+
+	@Override
+	public int getCapacity() {
+		return 32000 * mTier;
+	}
+
+	@Override
+	public int getTankPressure() {
+		return -100;
+	}
+
+	@Override
+	public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
+		if (aBaseMetaTileEntity.isClientSide()) {
+			return true;
+		}
+		aBaseMetaTileEntity.openGUI(aPlayer);
+		return true;
+	}
+
+	@Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescription, this.mTextures);
+	}
+
+	@Override
+	public int getSizeInventory() {
+		return 21;
+	}
+
+	private static final int getRange(int aTier) {
+		switch(aTier) {
+			case 1:
+				return 1;
+			case 2:
+				return 5;
+			case 3:
+				return 9;
+			case 4:
+				return 13;
+			case 5:
+				return 17;
+			case 6:
+				return 21;
+			case 7:
+				return 25;
+			case 8:
+				return 29;
+			case 9:
+				return 33;
+			default:
+				return 0;
+		}
+	}
+
+	private HashSet<ICropTile> mCropCache = new HashSet<ICropTile>();
+	private boolean mInvalidCache = false;
+
+	public boolean doesInventoryHaveSpace() {
+		for (int i = SLOT_OUTPUT_START; i < this.getSizeInventory(); i++) {
+			if (this.mInventory[i] == null || this.mInventory[i].stackSize < 64) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public long powerUsage() {
+		return this.maxEUInput() / 8;
+	}
+	
+	public long powerUsageSecondary() {
+		return this.maxEUInput() / 32;
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+		if (getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().isAllowedToWork() && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || aTick % 100 == 0)) {
+			if (this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()) {
+
+				int aTileX = this.getBaseMetaTileEntity().getXCoord();
+				int aTileY = this.getBaseMetaTileEntity().getXCoord();
+				int aTileZ = this.getBaseMetaTileEntity().getXCoord();
+
+				int aRadius = 10 + getRange(mTier);
+				int aSide = (aRadius-1)/2;				
+				ArrayList<ItemStack> aAllDrops = new ArrayList<ItemStack>();	
+
+				if (mCropCache.isEmpty() || aTick % 1200 == 0 || mInvalidCache) {
+					if (!mCropCache.isEmpty()) {
+						mCropCache.clear();
+					}
+					//Logger.INFO("Looking for crops.");
+					for (int y = 0; y <= 2; y++) {				
+						for (int x = (-aSide); x <= aSide; x++) {
+							for (int z = (-aSide); z <= aSide; z++) {
+								TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z);
+								if (tTileEntity != null && tTileEntity instanceof ICropTile) {
+									ICropTile tCrop = (ICropTile) tTileEntity;
+									mCropCache.add(tCrop);									
+								}
+							}	
+						}	
+					}
+				}
+
+				//Process Cache		
+				if (doesInventoryHaveSpace()) {
+					for (ICropTile tCrop : mCropCache) {
+						if (tCrop == null) {
+							mInvalidCache = true;
+							break;
+						}
+						CropCard aCrop = tCrop.getCrop();
+						if (aCrop != null) {
+							//Logger.INFO("Found "+aCrop.displayName()+" at offset "+x+", "+y+", "+z);
+							if (!aCrop.canGrow(tCrop) && aCrop.canBeHarvested(tCrop)) {
+								if (getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsage(), true)) {
+									ItemStack[] aHarvest = tCrop.harvest_automated(true);
+									if (aHarvest != null && aHarvest.length > 0) {								
+										for (ItemStack aStack : aHarvest) {
+											if (aStack.stackSize > 0) {
+												if (mTier * 5 > MathUtils.randInt(1, 100)) {
+													aStack.stackSize += Math.floor(tCrop.getGain()/10);
+													Logger.INFO("Bonus output given for "+aCrop.displayName());
+												}
+												Logger.INFO("Harvested "+aCrop.displayName());
+												aAllDrops.add(aStack);
+											}													
+										}
+									}
+								}
+							}
+							if (this.mModeAlternative) {
+								processSecondaryFunctions(tCrop);
+							}
+						}
+					}				
+
+					if (!aAllDrops.isEmpty()) {
+						Logger.INFO("Handling "+aAllDrops.size()+" Harvests");
+						Iterator<ItemStack> iter = aAllDrops.iterator();
+						while (iter.hasNext()) {
+							ItemStack aDrop = iter.next();						
+							if (ItemUtils.checkForInvalidItems(aDrop)) {
+
+								for (int i = SLOT_OUTPUT_START; i < this.getSizeInventory(); i++) {
+									if (this.mInventory[i] != null) {
+										//Logger.INFO("Slot "+i+" contains "+this.mInventory[i].getDisplayName());
+										if (GT_Utility.areStacksEqual(aDrop, mInventory[i], false)) {
+											//Same
+											if (mInventory[i].stackSize < 64 && (mInventory[i].stackSize + aDrop.stackSize <= 64)) {
+												//can merge
+												//Logger.INFO("Slot "+i+" size: "+mInventory[i].stackSize+" + Drop Size: "+aDrop.stackSize+" = "+(mInventory[i].stackSize + aDrop.stackSize));
+												mInventory[i].stackSize += aDrop.stackSize;
+												break;
+											}
+											else if (mInventory[i].stackSize < 64 && (mInventory[i].stackSize + aDrop.stackSize > 64)) {
+												//can merge
+												//Logger.INFO("Slot "+i+" size: "+mInventory[i].stackSize+" + Drop Size: "+aDrop.stackSize+" = "+(mInventory[i].stackSize + aDrop.stackSize));
+												int aRemainder = mInventory[i].stackSize + aDrop.stackSize - 64;
+												Logger.INFO("Remainder: "+aRemainder+", Continuing.");
+												mInventory[i].stackSize = 64;
+												aDrop.stackSize = aRemainder;
+												continue;
+											}
+											else {
+												//Logger.INFO("Slot "+i+" size: 64, Continuing.");
+												continue;
+											}
+										}
+									}
+									else {
+										//Logger.INFO("Slot "+i+" is empty, setting to "+aDrop.getDisplayName()+" x"+aDrop.stackSize);
+										this.mInventory[i] = aDrop;
+										break;
+									}
+								}
+							}
+
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public boolean hasFertilizer() {
+		for (int i = SLOT_FERT_1; i <= SLOT_FERT_4; i++) {
+			if (this.mInventory[i] != null) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean consumeFertilizer(boolean aSimulate) {
+		if (hasFertilizer()) {
+			for (int i = SLOT_FERT_1; i <= SLOT_FERT_4; i++) {
+				if (this.mInventory[i] != null) {
+					consume(i, 1, aSimulate);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public boolean hasWeedEX() {
+		for (int i = SLOT_WEEDEX_1; i <= SLOT_WEEDEX_2; i++) {
+			if (this.mInventory[i] != null) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean consumeWeedEX(boolean aSimulate) {
+		if (hasWeedEX()) {			
+			for (int i = SLOT_WEEDEX_1; i <= SLOT_WEEDEX_2; i++) {
+				if (this.mInventory[i] != null) {
+					damage(i, 1, aSimulate);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public void processSecondaryFunctions(ICropTile aCrop) {
+		if (!mModeAlternative) {
+			return;
+		}
+		if (hasFertilizer() && consumeFertilizer(true) && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true) && applyFertilizer(aCrop)) {
+			if (consumeFertilizer(false)) {
+				//Logger.INFO("Consumed Fert.");
+			}
+		}
+		if (this.getFluidAmount() > 0 && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true) && applyHydration(aCrop)) {
+			//Logger.INFO("Consumed Water.");
+		}
+		if (hasWeedEX() && consumeWeedEX(true) && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true) && applyWeedEx(aCrop)) {
+			if (consumeWeedEX(false)) {
+				//Logger.INFO("Consumed Weed-EX.");
+			}
+		}
+	}
+
+
+	public boolean applyWeedEx(ICropTile aCrop) {
+		if (aCrop.getWeedExStorage() < 150) {
+			aCrop.setWeedExStorage(aCrop.getWeedExStorage() + 50);
+			boolean triggerDecline;
+			triggerDecline = aCrop.getWorld().rand.nextInt(3) == 0;
+			if (aCrop.getCrop() != null && aCrop.getCrop().isWeed(aCrop) && aCrop.getWeedExStorage() >= 75 && triggerDecline) {
+				switch (aCrop.getWorld().rand.nextInt(5)) {
+					case 0 :
+						if (aCrop.getGrowth() > 0) {
+							aCrop.setGrowth((byte) (aCrop.getGrowth() - 1));
+						}
+					case 1 :
+						if (aCrop.getGain() > 0) {
+							aCrop.setGain((byte) (aCrop.getGain() - 1));
+						}
+					default :
+						if (aCrop.getResistance() > 0) {
+							aCrop.setResistance((byte) (aCrop.getResistance() - 1));
+						}
+				}
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public boolean applyFertilizer(ICropTile aCrop) {
+		if (aCrop.getNutrientStorage() >= 100) {
+			return false;
+		} else {
+			//Logger.INFO("Current Nutrient: "+aCrop.getNutrientStorage()+" for "+aCrop.getCrop().displayName());
+			aCrop.setNutrientStorage(100);
+			return true;
+		}
+	}
+
+	public boolean applyHydration(ICropTile aCrop) {
+		if (aCrop.getHydrationStorage() >= 200 || this.getFluidAmount() == 0) {
+			//Logger.INFO("Hydration Max");
+			return false;
+		} else {
+			int apply = 200 - aCrop.getHydrationStorage();
+			if (this.getFluidAmount() >= 0) {
+				int drain = 0;
+				if (this.getFluidAmount() >= apply) {