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

Update to Forestry 4

Browse source
This commit is contained in:
Shawn Buckley 2015-10-21 21:30:33 -04:00
parent 1a89d43ffc
commit cda516a3e3
5 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -14,7 +14,7 @@ cofhlib.version=[1.7.10]1.0.0RC7-127
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=3.6.9.28 forestry.version=4.0.10.39
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

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

@ -15,9 +15,9 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent;
import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry;
import forestry.factory.gadgets.MachineCentrifuge; import forestry.factory.recipes.ISqueezerRecipe;
import forestry.factory.gadgets.MachineCentrifuge.RecipeManager; import forestry.factory.tiles.TileCentrifuge;
import forestry.factory.gadgets.MachineSqueezer; import forestry.factory.tiles.TileSqueezer;
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;
@ -54,7 +54,8 @@ import gregtech.loaders.load.GT_FuelLoader;
import gregtech.loaders.load.GT_ItemIterator; import gregtech.loaders.load.GT_ItemIterator;
import gregtech.loaders.load.GT_SonictronLoader; import gregtech.loaders.load.GT_SonictronLoader;
import gregtech.loaders.misc.GT_Achievements; import gregtech.loaders.misc.GT_Achievements;
import gregtech.loaders.misc.GT_BeeDefinition; //import gregtech.loaders.misc.GT_BeeDefinition;
//import gregtech.loaders.misc.GT_Bees;
import gregtech.loaders.misc.GT_Bees; import gregtech.loaders.misc.GT_Bees;
import gregtech.loaders.misc.GT_CoverLoader; import gregtech.loaders.misc.GT_CoverLoader;
import gregtech.loaders.postload.GT_BlockResistanceLoader; import gregtech.loaders.postload.GT_BlockResistanceLoader;
@ -568,24 +569,18 @@ public class GT_Mod
} }
try try
{ {
for (Object tRecipe : MachineCentrifuge.RecipeManager.recipes) for (Object tRecipe : TileCentrifuge.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++;
} }
// for (int i = 0; i < outputs.size(); i++) { GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[] { ((TileCentrifuge.CentrifugeRecipe)tRecipe).getInput() }, tOutputs, null, tChances, null, null, 128, 5, 0);
// 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)
@ -596,9 +591,9 @@ for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) {
} }
try try
{ {
for (Object tRecipe : MachineSqueezer.RecipeManager.recipes) { for (Object tRecipe : TileSqueezer.RecipeManager.recipes) {
if ((((MachineSqueezer.Recipe)tRecipe).resources.length == 1) && (GT_Utility.getFluidForFilledItem(((MachineSqueezer.Recipe)tRecipe).resources[0], true) == null)) { if ((((ISqueezerRecipe)tRecipe).getResources().length == 1) && (((ISqueezerRecipe)tRecipe).getFluidOutput() != null)) {
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); 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);
} }
} }
} }

1
src/main/java/gregtech/common/items/ItemComb.java
View file

@ -15,7 +15,6 @@ import net.minecraft.util.IIcon;
import forestry.api.core.ForestryAPI; import forestry.api.core.ForestryAPI;
import forestry.api.core.Tabs; import forestry.api.core.Tabs;
import forestry.api.recipes.RecipeManagers; import forestry.api.recipes.RecipeManagers;
import forestry.factory.gadgets.MachineCentrifuge.RecipeManager;
import gregtech.api.enums.GT_Values; import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList; import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials; import gregtech.api.enums.Materials;

1
src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
View file

@ -5,7 +5,6 @@ import java.util.Locale;
import org.apache.commons.lang3.text.WordUtils; import org.apache.commons.lang3.text.WordUtils;
import crazypants.util.OreDictionaryHelper;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.BeeManager;

1
src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
View file

@ -4,7 +4,6 @@ import codechicken.nei.api.API;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.util.OreDictionaryHelper;
import gregtech.GT_Mod; import gregtech.GT_Mod;
import gregtech.api.GregTech_API; import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.ConfigCategories;