Fix #1258 undo ore unification experiment

This commit is contained in:
mezz committed 2016-06-01 12:43:00 -07:00
1 parent 340b04fee0
commit e23a406e6f
6 files changed
+21 -46

No files matched your search

@@ -48,14 +48,4 @@ public abstract class BlockRegistry {
OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE));
}
@Nonnull
public static ItemStack registerOreDictIfFirst(String oreName, ItemStack oreItem) {
ItemStack firstSuitableOre = OreDictUtil.getFirstSuitableOre(oreName);
if (firstSuitableOre != null) {
return firstSuitableOre;
}
OreDictionary.registerOre(oreName, oreItem);
return oreItem;
}
}
@@ -55,10 +55,17 @@ public class BlockRegistryCore extends BlockRegistry {
registerBlock(resourceStorage, new ItemBlockForestry(resourceStorage), "resourceStorage");
resourceStorage.setHarvestLevel("pickaxe", 0);
resourceStorageApatite = registerOreDictIfFirst(OreDictUtil.BLOCK_APATITE, resourceStorage.get(EnumResourceType.APATITE));
resourceStorageCopper = registerOreDictIfFirst(OreDictUtil.BLOCK_COPPER, resourceStorage.get(EnumResourceType.COPPER));
resourceStorageTin = registerOreDictIfFirst(OreDictUtil.BLOCK_TIN, resourceStorage.get(EnumResourceType.TIN));
resourceStorageBronze = registerOreDictIfFirst(OreDictUtil.BLOCK_BRONZE, resourceStorage.get(EnumResourceType.BRONZE));
resourceStorageApatite = resourceStorage.get(EnumResourceType.APATITE);
OreDictionary.registerOre(OreDictUtil.BLOCK_APATITE, resourceStorageApatite);
resourceStorageCopper = resourceStorage.get(EnumResourceType.COPPER);
OreDictionary.registerOre(OreDictUtil.BLOCK_COPPER, resourceStorageCopper);
resourceStorageTin = resourceStorage.get(EnumResourceType.TIN);
OreDictionary.registerOre(OreDictUtil.BLOCK_TIN, resourceStorageTin);
resourceStorageBronze = resourceStorage.get(EnumResourceType.BRONZE);
OreDictionary.registerOre(OreDictUtil.BLOCK_BRONZE, resourceStorageBronze);
// register some common oreDict names for our recipes
OreDictionary.registerOre(OreDictUtil.CRAFTING_TABLE_WOOD, Blocks.CRAFTING_TABLE);
@@ -95,11 +95,11 @@ public class BlockResourceOre extends Block implements IItemModelRegister, IBloc
break;
}
case TIN: {
drops.add(OreDictUtil.getFirstSuitableOre(OreDictUtil.ORE_TIN));
drops.add(new ItemStack(this, 1, damageDropped(state)));
break;
}
case COPPER: {
drops.add(OreDictUtil.getFirstSuitableOre(OreDictUtil.ORE_COPPER));
drops.add(new ItemStack(this, 1, damageDropped(state)));
break;
}
}
@@ -19,7 +19,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import forestry.core.proxy.Proxies;
import forestry.core.utils.OreDictUtil;
import forestry.plugins.PluginManager;
public abstract class ItemRegistry {
@@ -42,12 +41,6 @@ public abstract class ItemRegistry {
@Nonnull
public static ItemStack createItemForOreName(String oreName) {
ItemStack oreItem = new ItemStack(registerItem(new ItemForestry(), oreName));
ItemStack firstSuitableOre = OreDictUtil.getFirstSuitableOre(oreName);
if (firstSuitableOre != null) {
return firstSuitableOre;
}
OreDictionary.registerOre(oreName, oreItem);
return oreItem;
}
@@ -71,24 +71,4 @@ public class OreDictUtil {
public static final String GEM_QUARTZ = "gemQuartz";
public static final String CHEST_WOOD = "chestWood";
public static final String LEATHER = "leather";
/**
* Used for ores and metals where conflicts are common.
* This way, Forestry can choose whatever is first in the oreDictionary instead of its own metals.
* If more mods do this, they will automatically unify on one set of metals.
*/
@Nullable
public static ItemStack getFirstSuitableOre(String oreName) {
if (OreDictionary.doesOreNameExist(oreName)) {
List<ItemStack> ores = OreDictionary.getOres(oreName);
for (ItemStack ore : ores) {
if (ore != null && ore.getItem() != null && ore.getMetadata() != OreDictionary.WILDCARD_VALUE) {
ItemStack oreCopy = ore.copy();
oreCopy.stackSize = 1;
return oreCopy;
}
}
}
return null;
}
}
@@ -18,6 +18,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.storage.ICrateRegistry;
import forestry.core.items.ItemCrated;
@@ -53,9 +54,13 @@ public class CrateRegistry implements ICrateRegistry {
@Override
public void registerCrate(@Nonnull String oreDictName) {
ItemStack stack = OreDictUtil.getFirstSuitableOre(oreDictName);
if (stack != null) {
registerCrate(stack, oreDictName);
if (OreDictionary.doesOreNameExist(oreDictName)) {
for (ItemStack stack : OreDictionary.getOres(oreDictName)) {
if (stack != null) {
registerCrate(stack, oreDictName);
break;
}
}
}
}