Skip to content

Commit 70c116c

Browse files
committed
update to forestry 4.0
1 parent efb34b3 commit 70c116c

File tree

1 file changed

+24
-27
lines changed

1 file changed

+24
-27
lines changed

src/main/java/gregtech/GT_Mod.java

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@
1515
import cpw.mods.fml.common.event.FMLServerStartingEvent;
1616
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
1717
import cpw.mods.fml.common.registry.EntityRegistry;
18-
import forestry.factory.gadgets.MachineCentrifuge;
19-
import forestry.factory.gadgets.MachineCentrifuge.RecipeManager;
20-
import forestry.factory.gadgets.MachineSqueezer;
18+
import forestry.factory.recipes.ISqueezerRecipe;
19+
import forestry.factory.tiles.TileCentrifuge;
20+
import forestry.factory.tiles.TileSqueezer;
21+
//import forestry.factory.gadgets.MachineCentrifuge;
22+
//import forestry.factory.gadgets.MachineCentrifuge.RecipeManager;
23+
//import forestry.factory.gadgets.MachineSqueezer;
2124
import gregtech.api.GregTech_API;
2225
import gregtech.api.enchants.Enchantment_EnderDamage;
2326
import gregtech.api.enchants.Enchantment_Radioactivity;
2427
import gregtech.api.enums.ConfigCategories.Recipes;
25-
import gregtech.api.enums.*;
28+
import gregtech.api.enums.*;
2629
import gregtech.api.enums.Textures.BlockIcons;
2730
import gregtech.api.enums.Textures.ItemIcons;
2831
import gregtech.api.interfaces.internal.IGT_Mod;
@@ -40,7 +43,7 @@
4043
import gregtech.api.util.GT_Recipe;
4144
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
4245
import gregtech.api.util.GT_RecipeRegistrator;
43-
import gregtech.api.util.GT_SpawnEventHandler;
46+
import gregtech.api.util.GT_SpawnEventHandler;
4447
import gregtech.api.util.GT_Utility;
4548
import gregtech.common.GT_DummyWorld;
4649
import gregtech.common.GT_Network;
@@ -53,7 +56,7 @@
5356
import gregtech.loaders.load.GT_FuelLoader;
5457
import gregtech.loaders.load.GT_ItemIterator;
5558
import gregtech.loaders.load.GT_SonictronLoader;
56-
import gregtech.loaders.misc.GT_Achievements;
59+
import gregtech.loaders.misc.GT_Achievements;
5760
import gregtech.loaders.misc.GT_CoverLoader;
5861
import gregtech.loaders.postload.GT_BlockResistanceLoader;
5962
import gregtech.loaders.postload.GT_BookAndLootLoader;
@@ -102,12 +105,12 @@
102105
import net.minecraft.item.crafting.CraftingManager;
103106
import net.minecraft.item.crafting.FurnaceRecipes;
104107
import net.minecraft.item.crafting.IRecipe;
105-
import net.minecraft.stats.Achievement;
108+
import net.minecraft.stats.Achievement;
106109
import net.minecraft.util.WeightedRandomChestContent;
107110
import net.minecraft.world.World;
108111
import net.minecraft.world.biome.BiomeGenBase;
109112
import net.minecraftforge.common.ChestGenHooks;
110-
import net.minecraftforge.common.ForgeVersion;
113+
import net.minecraftforge.common.ForgeVersion;
111114
import net.minecraftforge.common.config.Configuration;
112115
import net.minecraftforge.common.config.Property;
113116
import net.minecraftforge.fluids.FluidContainerRegistry;
@@ -564,24 +567,18 @@ public void onPostLoad(FMLPostInitializationEvent aEvent)
564567
}
565568
try
566569
{
567-
for (Object tRecipe : MachineCentrifuge.RecipeManager.recipes)
568-
{
569-
570-
571-
Map<ItemStack,Float> outputs = ((MachineCentrifuge.CentrifugeRecipe)tRecipe).getAllProducts();
570+
for (Object tRecipe : TileCentrifuge.RecipeManager.recipes)
571+
{
572+
Map<ItemStack,Float> outputs = ((TileCentrifuge.CentrifugeRecipe)tRecipe).getAllProducts();
572573
ItemStack[] tOutputs = new ItemStack[outputs.size()];
573574
int[] tChances = new int[outputs.size()];
574-
int i =0;
575-
for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) {
576-
tChances[i] = (int) (entry.getValue()*10000);
577-
tOutputs[i] = entry.getKey().copy();
578-
i++;
579-
}
580-
// for (int i = 0; i < outputs.size(); i++) {
581-
// tOutputs[i] = outputs.entrySet().
582-
// tChances[i] = (tOriginalChances[i].intValue() * 100);
583-
// }
584-
GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[] { ((MachineCentrifuge.CentrifugeRecipe)tRecipe).getInput() }, tOutputs, null, tChances, null, null, 128, 5, 0);
575+
int i =0;
576+
for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) {
577+
tChances[i] = (int) (entry.getValue()*10000);
578+
tOutputs[i] = entry.getKey().copy();
579+
i++;
580+
}
581+
GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[] { ((TileCentrifuge.CentrifugeRecipe)tRecipe).getInput() }, tOutputs, null, tChances, null, null, 128, 5, 0);
585582
}
586583
}
587584
catch (Throwable e)
@@ -592,9 +589,9 @@ public void onPostLoad(FMLPostInitializationEvent aEvent)
592589
}
593590
try
594591
{
595-
for (Object tRecipe : MachineSqueezer.RecipeManager.recipes) {
596-
if ((((MachineSqueezer.Recipe)tRecipe).resources.length == 1) && (GT_Utility.getFluidForFilledItem(((MachineSqueezer.Recipe)tRecipe).resources[0], true) == null)) {
597-
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);
592+
for (Object tRecipe : TileSqueezer.RecipeManager.recipes) {
593+
if ((((ISqueezerRecipe)tRecipe).getResources().length == 1) && (((ISqueezerRecipe)tRecipe).getFluidOutput() != null)) {
594+
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);
598595
}
599596
}
600597
}

0 commit comments

Comments
 (0)