Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Backdate to Forestry 3 because using the GT Centrifuge for Bee products too

Browse source
This commit is contained in:
Dream-Master 2015-11-04 20:24:18 +01:00
parent 732172cce8
commit 0c36ac30b7
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.4.1492-1.7.10 forge.version=10.13.4.1492-1.7.10
gt.version=5.08.32.1 gt.version=5.08.32.2
ae2.version=rv2-beta-33 ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407 applecore.version=1.7.10-1.2.1+107.59407
@ -15,7 +15,7 @@ cofhlib.version=[1.7.10]1.0.3-175-dev
enderio.cf=2219/296 enderio.cf=2219/296
enderio.version=1.7.10-2.3.0.417_beta enderio.version=1.7.10-2.3.0.417_beta
enderiocore.version=1.7.10-0.1.0.25_beta enderiocore.version=1.7.10-0.1.0.25_beta
forestry.version=4.0.10.39 forestry.version=3.6.12.3
ic2.version=2.2.780-experimental ic2.version=2.2.780-experimental
nei.version=1.0.3.57 nei.version=1.0.3.57
railcraft.cf=2219/321 railcraft.cf=2219/321

29
src/main/java/gregtech/GT_Mod.java
View file

@ -3,9 +3,9 @@ package gregtech;
import cpw.mods.fml.common.*; import cpw.mods.fml.common.*;
import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry;
import forestry.factory.recipes.ISqueezerRecipe; import forestry.factory.gadgets.MachineCentrifuge;
import forestry.factory.tiles.TileCentrifuge; import forestry.factory.gadgets.MachineCentrifuge.RecipeManager;
import forestry.factory.tiles.TileSqueezer; import forestry.factory.gadgets.MachineSqueezer;
import gregtech.api.GregTech_API; import gregtech.api.GregTech_API;
import gregtech.api.enchants.Enchantment_EnderDamage; import gregtech.api.enchants.Enchantment_EnderDamage;
import gregtech.api.enchants.Enchantment_Radioactivity; import gregtech.api.enchants.Enchantment_Radioactivity;
@ -472,17 +472,24 @@ public class GT_Mod
} }
} }
try { try {
for (Object tRecipe : TileCentrifuge.RecipeManager.recipes) { for (Object tRecipe : MachineCentrifuge.RecipeManager.recipes)
Map<ItemStack, Float> outputs = ((TileCentrifuge.CentrifugeRecipe) tRecipe).getAllProducts(); {
Map<ItemStack,Float> outputs = ((MachineCentrifuge.CentrifugeRecipe)tRecipe).getAllProducts();
ItemStack[] tOutputs = new ItemStack[outputs.size()]; ItemStack[] tOutputs = new ItemStack[outputs.size()];
int[] tChances = new int[outputs.size()]; int[] tChances = new int[outputs.size()];
int i = 0; int i =0;
for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) { for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) {
tChances[i] = (int) (entry.getValue() * 10000); tChances[i] = (int) (entry.getValue()*10000);
tOutputs[i] = entry.getKey().copy(); tOutputs[i] = entry.getKey().copy();
i++; i++;
} }
GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[]{((TileCentrifuge.CentrifugeRecipe) tRecipe).getInput()}, tOutputs, null, tChances, null, null, 128, 5, 0); // for (int i = 0; i < outputs.size(); i++) {
// tOutputs[i] = outputs.entrySet().
// tChances[i] = (tOriginalChances[i].intValue() * 100);
// }
GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[] { ((MachineCentrifuge.CentrifugeRecipe)tRecipe).getInput() }, tOutputs, null, tChances, null, null, 128, 5, 0);
} }
} catch (Throwable e) { } catch (Throwable e) {
if (GT_Values.D1) { if (GT_Values.D1) {
@ -490,9 +497,9 @@ public class GT_Mod
} }
} }
try { try {
for (Object tRecipe : TileSqueezer.RecipeManager.recipes) { for (Object tRecipe : MachineSqueezer.RecipeManager.recipes) {
if ((((ISqueezerRecipe) tRecipe).getResources().length == 1) && (((ISqueezerRecipe) tRecipe).getFluidOutput() != null)) { if ((((MachineSqueezer.Recipe)tRecipe).resources.length == 1) && (GT_Utility.getFluidForFilledItem(((MachineSqueezer.Recipe)tRecipe).resources[0], true) == null)) {
GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[]{((ISqueezerRecipe) tRecipe).getResources()[0]}, new ItemStack[]{((ISqueezerRecipe) tRecipe).getRemnants()}, null, new int[]{(int) (((ISqueezerRecipe) tRecipe).getRemnantsChance() * 10000)}, null, new FluidStack[]{((ISqueezerRecipe) tRecipe).getFluidOutput()}, 400, 2, 0); GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[] { ((MachineSqueezer.Recipe)tRecipe).resources[0] }, new ItemStack[] { ((MachineSqueezer.Recipe)tRecipe).remnants }, null, new int[] { ((MachineSqueezer.Recipe)tRecipe).chance * 100 }, null, new FluidStack[] { ((MachineSqueezer.Recipe)tRecipe).liquid }, 400, 2, 0);
} }
} }
} catch (Throwable e) { } catch (Throwable e) {