maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild

Browse source
This commit is contained in:
ProfessorProspector 2016-12-21 15:59:27 -08:00
parent 3131556ec8
commit 78a3d1f589
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/techreborn/init/OreDict.java
View file

@ -7,12 +7,10 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.StringUtils;
import techreborn.Core;
import techreborn.blocks.BlockMachineFrame;
import techreborn.items.*;
import techreborn.parts.powerCables.ItemStandaloneCables;
import techreborn.utils.OreDictUtils;
public class OreDict {
@ -82,7 +80,7 @@ public class OreDict {
for (String type : ItemGems.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre("gem" + StringUtils.toFirstCapital(type.toLowerCase()), ItemGems.getGemByName(type));
OreDictionary.registerOre("gem" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "gem_" + type), ItemGems.getGemByName(type));
boolean ignoreIt = false;
for (String ignore : plateGenIgnores)
if (type.startsWith(ignore))
@ -91,11 +89,10 @@ public class OreDict {
ItemPlates.registerType(type);
}
for (String type : ItemIngots.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre("ingot" + StringUtils.toFirstCapital(type.toLowerCase()), ItemIngots.getIngotByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type));
boolean ignoreIt = false;
for (String ignore : plateGenIgnores)
if (type.startsWith(ignore))
@ -107,33 +104,26 @@ public class OreDict {
for (String type : ItemPlates.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre("plate" + StringUtils.toFirstCapital(type.toLowerCase()), ItemPlates.getPlateByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
}
for (String type : ItemDusts.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre("dust" + StringUtils.toFirstCapital(type.toLowerCase()), ItemDusts.getDustByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type));
}
for (String type : ItemDustsSmall.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre("dustTiny" + StringUtils.toFirstCapital(type.toLowerCase()), ItemDustsSmall.getSmallDustByName(type));
OreDictionary.registerOre("dustSmall" + StringUtils.toFirstCapital(type.toLowerCase()), ItemDustsSmall.getSmallDustByName(type));
}
for (String type : ItemDustsSmall.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
String oreDictName = "dustSmall" + OreDictUtils.toFirstUpper(type);
OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_tiny_" + type), ItemDustsSmall.getSmallDustByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type));
}
for (String type : ItemNuggets.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre("nugget" + StringUtils.toFirstCapital(type.toLowerCase()), ItemNuggets.getNuggetByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type));
}
}