Fix several broken ItemStacks and recipes

This commit is contained in:
mezz committed 2016-10-30 19:24:46 -07:00
1 parent 775b4109a9
commit 697ccabf53
5 files changed
+57 -34

No files matched your search

@@ -53,17 +53,8 @@ public class ModuleMachine implements IInitializable {
final String diamondGear = !OreDictionary.getOres("gearDiamond").isEmpty() ? "gearIron" : "ingotIron";
for (final Object circuit : standardCircuit) {
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Incubator.get(1), "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', Blocks.FURNACE, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', ironGear));
Item alyzer = null;
if (BinnieCore.isApicultureActive()) {
alyzer = Mods.Forestry.item("beealyzer");
} else if (BinnieCore.isArboricultureActive()) {
alyzer = Mods.Forestry.item("treealyzer");
} else if (BinnieCore.isArboricultureActive()) {
alyzer = Mods.Forestry.item("flutterlyzer");
}
if (alyzer != null) {
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Analyser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', GeneticsItems.DNADye.get(1)));
}
Item alyzer = Mods.Forestry.item("portableAlyzer");
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Analyser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', GeneticsItems.DNADye.get(1)));
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Genepool.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Blocks.GLASS));
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Acclimatiser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', Items.LAVA_BUCKET, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Items.WATER_BUCKET));
}
@@ -5,6 +5,7 @@ import binnie.botany.api.EnumFlowerChromosome;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import binnie.core.genetics.Tolerance;
import binnie.core.liquid.FluidContainer;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
@@ -14,6 +15,9 @@ import forestry.api.lepidopterology.EnumButterflyChromosome;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidUtil;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -100,11 +104,11 @@ public class Acclimatiser {
addTemperatureItem(new ItemStack(Blocks.ICE), -0.75f);
addHumidityItem(new ItemStack(Items.WATER_BUCKET), 0.75f);
addHumidityItem(new ItemStack(Blocks.SAND), -0.15f);
addTemperatureItem(Mods.Forestry.stack("canLava"), 0.75f);
addTemperatureItem(Mods.Forestry.stack("refractoryLava"), 0.75f);
addHumidityItem(Mods.Forestry.stack("canWater"), 0.75f);
addHumidityItem(Mods.Forestry.stack("refractoryWater"), 0.75f);
addHumidityItem(Mods.Forestry.stack("waxCapsuleWater"), 0.75f);
addTemperatureItem(FluidContainer.Can.getFilled(FluidRegistry.LAVA), 0.75f);
addTemperatureItem(FluidContainer.Refractory.getFilled(FluidRegistry.LAVA), 0.75f);
addHumidityItem(FluidContainer.Can.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainer.Refractory.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainer.Capsule.getFilled(FluidRegistry.WATER), 0.75f);
}
public static boolean canAcclimatise(final ItemStack stack, final List<ItemStack> acclimatisers) {