From a4dd450ff85c90c062111cd4d4ae4993e1129a73 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 21 Nov 2015 14:04:53 -0800 Subject: [PATCH] Add mutation condition requireResource(String oreDictName) --- api/forestry | 2 +- .../core/genetics/mutations/Mutation.java | 6 ++ .../MutationConditionRequiresResource.java | 12 +++- ...ationConditionRequiresResourceOreDict.java | 67 +++++++++++++++++++ 4 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java diff --git a/api/forestry b/api/forestry index 2af681c0f..1cc39bd54 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 2af681c0f218204b8308672fb9256eba770ff127 +Subproject commit 1cc39bd54c7a6e9dcf0cb3f6cc35980d19e55cc4 diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index fdaa7ad18..5adb68c92 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -111,6 +111,12 @@ public abstract class Mutation implements IMutationCustom { return addMutationCondition(mutationCondition); } + @Override + public Mutation requireResource(String oreName) { + IMutationCondition mutationCondition = new MutationConditionRequiresResourceOreDict(oreName); + return addMutationCondition(mutationCondition); + } + @Override public Mutation addMutationCondition(IMutationCondition mutationCondition) { mutationConditions.add(mutationCondition); diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index 43f1fb26a..fd518f110 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; @@ -30,8 +31,15 @@ public class MutationConditionRequiresResource implements IMutationCondition { @Override public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - Block block = world.getBlock(x, y - 1, z); - int meta = world.getBlockMetadata(x, y - 1, z); + Block block; + int meta; + int i = 1; + do { + block = world.getBlock(x, y - i, z); + meta = world.getBlockMetadata(x, y - i, z); + i++; + } while (block instanceof IBeeHousing); + return ItemStackUtil.equals(block, meta, blockRequired) ? 1 : 0; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java new file mode 100644 index 000000000..5e4acee57 --- /dev/null +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.genetics.mutations; + +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IMutationCondition; +import forestry.core.utils.StringUtil; + +public class MutationConditionRequiresResourceOreDict implements IMutationCondition { + + private final int oreDictId; + private final String displayName; + + public MutationConditionRequiresResourceOreDict(String oreDictName) { + this.oreDictId = OreDictionary.getOreID(oreDictName); + + ArrayList ores = OreDictionary.getOres(oreDictName); + if (ores != null && 0 < ores.size()) { + this.displayName = ores.get(0).getDisplayName(); + } else { + this.displayName = oreDictName; + } + } + + @Override + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + Block block; + int meta; + int i = 1; + do { + block = world.getBlock(x, y - i, z); + meta = world.getBlockMetadata(x, y - i, z); + i++; + } while (block instanceof IBeeHousing); + + int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block, 1, meta)); + for (int oreId : oreIds) { + if (oreId == this.oreDictId) { + return 1; + } + } + return 0; + } + + @Override + public String getDescription() { + return StringUtil.localizeAndFormat("mutation.condition.resource", displayName); + } +}