Merge pull request #182 from GTNewHorizons/bmf

Bmf

5 files changed, 150 insertions, 32 deletions

diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index 9c3b4a8ae5..db0db134ff 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -462,9 +462,18 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 

     @Override

     public float getDigSpeed(ItemStack aStack, Block aBlock, int aMetaData) {

-        if (!isItemStackUsable(aStack)) return 0.0F;

+

+        if (!isItemStackUsable(aStack))

+            return 0.0F;

+

         IToolStats tStats = getToolStats(aStack);

-        if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData)) return 0.0F;

+

+        if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData))

+            return 0.0F;

+

+        if (aBlock.getHarvestLevel(aMetaData) == 0 && !tStats.isMinableBlock(aBlock, (byte) aMetaData))

+            return Math.min(Math.max(Float.MIN_NORMAL, ((tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) /2)),1.0F);

+

         return tStats.isMinableBlock(aBlock, (byte) aMetaData) ? Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) : 0.0F;

     }

 

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index 5d672547d8..267287c430 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -2,6 +2,7 @@ package gregtech.api.metatileentity.implementations;
 

 import cofh.api.energy.IEnergyReceiver;

 import com.google.common.collect.Sets;

+import cpw.mods.fml.common.Loader;

 import gregtech.GT_Mod;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Dyes;

@@ -17,6 +18,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;

 import gregtech.api.metatileentity.MetaPipeEntity;

 import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.util.GT_GC_Compat;

 import gregtech.api.util.GT_CoverBehavior;

 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_Utility;

@@ -29,12 +31,7 @@ import ic2.api.energy.tile.IEnergySink;
 import ic2.api.energy.tile.IEnergySource;

 import ic2.api.energy.tile.IEnergyTile;

 import ic2.api.reactor.IReactorChamber;

-import micdoodle8.mods.galacticraft.api.power.EnergySource;

-import micdoodle8.mods.galacticraft.api.power.EnergySource.EnergySourceAdjacent;

-import micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC;

-import micdoodle8.mods.galacticraft.api.transmission.NetworkType;

-import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector;

-import micdoodle8.mods.galacticraft.core.energy.EnergyConfigHandler;

+

 import net.minecraft.entity.Entity;

 import net.minecraft.entity.EntityLivingBase;

 import net.minecraft.entity.player.EntityPlayer;

@@ -242,6 +239,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         return rUsedAmperes;

     }

 

+

+

     private long insertEnergyInto(TileEntity tTileEntity, byte tSide, long aVoltage, long aAmperage) {

         if (aAmperage == 0 || tTileEntity == null) return 0;

 

@@ -264,26 +263,10 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             return 0;

         }

 

-        // GC Compat

-        if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC) {

-            if (!(tTileEntity instanceof IConnector) || ((IConnector)tTileEntity).canConnect(tDirection, NetworkType.POWER)) {

-                EnergySource eSource = new EnergySourceAdjacent(tDirection);

-

-                float tSizeToReceive = aVoltage * EnergyConfigHandler.IC2_RATIO, tStored = ((IEnergyHandlerGC)tTileEntity).getEnergyStoredGC(eSource);

-                if (tSizeToReceive >= tStored || tSizeToReceive <= ((IEnergyHandlerGC)tTileEntity).getMaxEnergyStoredGC(eSource) - tStored) {

-                    float tReceived = ((IEnergyHandlerGC)tTileEntity).receiveEnergyGC(eSource, tSizeToReceive, false);

-                    if (tReceived > 0) {

-                        tSizeToReceive -= tReceived;

-                        while (tSizeToReceive > 0) {

-                            tReceived = ((IEnergyHandlerGC)tTileEntity).receiveEnergyGC(eSource, tSizeToReceive, false);

-                            if (tReceived < 1) break;

-                            tSizeToReceive -= tReceived;

-                        }

-                        return 1;

-                    }

-                }

-            }

-            return 0;

+        if (Loader.isModLoaded("GalacticraftCore")) {

+            long gc = GT_GC_Compat.insertEnergyInto(tTileEntity, aVoltage, tDirection);

+            if (gc != 2)

+                return gc;

         }

 

         // IC2 Compat

@@ -464,9 +447,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         if (coverBehavior instanceof GT_Cover_SolarPanel) return true;

 

         // ((tIsGregTechTileEntity && tIsTileEntityCable) && (tAlwaysLookConnected || tLetEnergyIn || tLetEnergyOut) ) --> Not needed

-

-        // GC Compat

-        if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC && (!(tTileEntity instanceof IConnector) || ((IConnector)tTileEntity).canConnect(tDir, NetworkType.POWER)))

+        if (Loader.isModLoaded("GalacticraftCore") && GT_GC_Compat.canConnect(tTileEntity,tDir))

             return true;

 

         // AE2-p2p Compat

diff --git a/src/main/java/gregtech/api/util/GT_Forestry_Compat.java b/src/main/java/gregtech/api/util/GT_Forestry_Compat.java
new file mode 100644
index 0000000000..c59e551373
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GT_Forestry_Compat.java
@@ -0,0 +1,80 @@
+package gregtech.api.util;
+
+import forestry.api.recipes.ICentrifugeRecipe;
+import forestry.api.recipes.ISqueezerRecipe;
+import forestry.api.recipes.RecipeManagers;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.Map;
+
+public class GT_Forestry_Compat {
+    
+    public static void populateFakeNeiRecipes(){
+        if (ItemList.FR_Bee_Drone.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Bee_Drone.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Bee_Drone.getWithName(1L, "Scanned Drone")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Bee_Princess.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Bee_Princess.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Bee_Princess.getWithName(1L, "Scanned Princess")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Bee_Queen.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Bee_Queen.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Bee_Queen.getWithName(1L, "Scanned Queen")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Tree_Sapling.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Tree_Sapling.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Tree_Sapling.getWithName(1L, "Scanned Sapling")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Butterfly.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Butterfly.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Butterfly.getWithName(1L, "Scanned Butterfly")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Larvae.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Larvae.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Larvae.getWithName(1L, "Scanned Larvae")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Serum.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Serum.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Serum.getWithName(1L, "Scanned Serum")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_Caterpillar.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_Caterpillar.getWildcard(1L)}, new ItemStack[]{ItemList.FR_Caterpillar.getWithName(1L, "Scanned Caterpillar")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+        if (ItemList.FR_PollenFertile.get(1L) != null) {
+            GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.FR_PollenFertile.getWildcard(1L)}, new ItemStack[]{ItemList.FR_PollenFertile.getWithName(1L, "Scanned Pollen")}, null, new FluidStack[]{Materials.Honey.getFluid(100L)}, null, 500, 2, 0);
+        }
+    }
+    
+    public static void transferCentrifugeRecipes(){
+        try {
+            for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) {
+                Map<ItemStack, Float> outputs = tRecipe.getAllProducts();
+                ItemStack[] tOutputs = new ItemStack[outputs.size()];
+                int[] tChances = new int[outputs.size()];
+                int i = 0;
+                for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) {
+                    tChances[i] = (int) (entry.getValue() * 10000);
+                    tOutputs[i] = entry.getKey().copy();
+                    i++;
+                }
+                GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[]{tRecipe.getInput()}, tOutputs, null, tChances, null, null, 128, 5, 0);
+            }
+        } catch (Throwable e) {
+            if (GT_Values.D1) {
+                e.printStackTrace(GT_Log.err);
+            }
+        }
+    }
+    
+    public static void transferSqueezerRecipes(){
+        try {
+            for (ISqueezerRecipe tRecipe : RecipeManagers.squeezerManager.recipes()) {
+                if ((tRecipe.getResources().length == 1) && (tRecipe.getFluidOutput() != null)) {
+                    GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[]{tRecipe.getResources()[0]}, new ItemStack[]{tRecipe.getRemnants()}, null, new int[]{(int) (tRecipe.getRemnantsChance() * 10000)}, null, new FluidStack[]{tRecipe.getFluidOutput()}, 32, 8, 0);
+                }
+            }
+        } catch (Throwable e) {
+            if (GT_Values.D1) {
+                e.printStackTrace(GT_Log.err);
+            }
+        }
+    }
+}
diff --git a/src/main/java/gregtech/api/util/GT_GC_Compat.java b/src/main/java/gregtech/api/util/GT_GC_Compat.java
new file mode 100644
index 0000000000..8131e3affb
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GT_GC_Compat.java
@@ -0,0 +1,47 @@
+package gregtech.api.util;
+
+import gregtech.api.GregTech_API;
+import micdoodle8.mods.galacticraft.api.power.EnergySource;
+import micdoodle8.mods.galacticraft.api.power.EnergySource.EnergySourceAdjacent;
+import micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC;
+import micdoodle8.mods.galacticraft.api.transmission.NetworkType;
+import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector;
+import micdoodle8.mods.galacticraft.core.energy.EnergyConfigHandler;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class GT_GC_Compat {
+
+    public static long insertEnergyInto(TileEntity tTileEntity, long aVoltage, ForgeDirection tDirection) {
+        // GC Compat
+        if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC) {
+            if (!(tTileEntity instanceof IConnector) || ((IConnector)tTileEntity).canConnect(tDirection, NetworkType.POWER)) {
+                EnergySource eSource = new EnergySourceAdjacent(tDirection);
+
+                float tSizeToReceive = aVoltage * EnergyConfigHandler.IC2_RATIO, tStored = ((IEnergyHandlerGC)tTileEntity).getEnergyStoredGC(eSource);
+                if (tSizeToReceive >= tStored || tSizeToReceive <= ((IEnergyHandlerGC)tTileEntity).getMaxEnergyStoredGC(eSource) - tStored) {
+                    float tReceived = ((IEnergyHandlerGC)tTileEntity).receiveEnergyGC(eSource, tSizeToReceive, false);
+                    if (tReceived > 0) {
+                        tSizeToReceive -= tReceived;
+                        while (tSizeToReceive > 0) {
+                            tReceived = ((IEnergyHandlerGC)tTileEntity).receiveEnergyGC(eSource, tSizeToReceive, false);
+                            if (tReceived < 1) break;
+                            tSizeToReceive -= tReceived;
+                        }
+                        return 1;
+                    }
+                }
+            }
+            return 0;
+        }
+        return 2;
+    }
+
+    public static boolean canConnect(TileEntity tTileEntity,ForgeDirection tDirection){
+        // GC Compat
+        if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC && (!(tTileEntity instanceof IConnector) || ((IConnector)tTileEntity).canConnect(tDirection, NetworkType.POWER)))
+            return true;
+        return false;
+    }
+
+}
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index f26df767b8..462211c110 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -275,7 +275,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 

     public static void reInit() {

         GT_Log.out.println("GT_Mod: Re-Unificating Recipes.");

-        for (GT_Recipe_Map tMapEntry : GT_Recipe_Map.sMappings) tMapEntry.reInit();

+        for (GT_Recipe_Map tMapEntry : GT_Recipe_Map.sMappings)

+            tMapEntry.reInit();

     }

 

     // -----