Plates are flattened and enumed
This commit is contained in:
parent
be024f0179
commit
f45da44f2b
8 changed files with 241 additions and 209 deletions
|
@ -41,7 +41,6 @@ import techreborn.items.armor.ItemLithiumBatpack;
|
|||
import techreborn.items.armor.ItemTRArmour;
|
||||
import techreborn.items.battery.*;
|
||||
import techreborn.items.tools.*;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class ModItems {
|
||||
|
@ -60,7 +59,7 @@ public class ModItems {
|
|||
public static Item LAPOTRONIC_ORB;
|
||||
public static Item MANUAL;
|
||||
public static Item UU_MATTER;
|
||||
public static Item PLATES;
|
||||
|
||||
public static Item CLOAKING_DEVICE;
|
||||
public static Item RE_BATTERY;
|
||||
public static Item TREE_TAP;
|
||||
|
@ -165,8 +164,11 @@ public class ModItems {
|
|||
registerItem(DUSTS, "dust");
|
||||
SMALL_DUSTS = new ItemDustsSmall();
|
||||
registerItem(SMALL_DUSTS, "smallDust");
|
||||
// PLATES = new ItemPlates();
|
||||
// registerItem(PLATES, "plates");
|
||||
|
||||
for (ModPlates plate : ModPlates.values()){
|
||||
registerItem(plate.item, plate.name);
|
||||
}
|
||||
|
||||
NUGGETS = new ItemNuggets();
|
||||
registerItem(NUGGETS, "nuggets");
|
||||
// purifiedCrushedOre = new ItemPurifiedCrushedOre();
|
||||
|
|
|
@ -26,7 +26,6 @@ package techreborn.init;
|
|||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.items.ItemPlates;
|
||||
|
||||
|
@ -38,34 +37,56 @@ import techreborn.items.ItemPlates;
|
|||
public enum ModPlates implements IStringSerializable {
|
||||
ADVANCED_ALLOY_PLATE("plateAdvancedAlloy"),
|
||||
ALUMINUM_PLATE("plateAluminum"),
|
||||
// BRASS_PLATE("plateBrass"),
|
||||
// BRONZE_PLATE("plateBronze"),
|
||||
// CARBON_PLATE("plateCarbon"),
|
||||
// COAL_PLATE("plateCoal"),
|
||||
// COPPER_PLATE("plateCopper"),
|
||||
// DIAMOND_PLATE("plateDiamond"),
|
||||
//
|
||||
// IRON_PLATE("plateIron"),
|
||||
// GOLD_PLATE("plateGold"),
|
||||
//
|
||||
// WOOD_PLATE("plateWood"),
|
||||
// REDSTONE_PLATE("plateRedstone"),
|
||||
//
|
||||
// EMERALD_PLATE("plateEmerald"),
|
||||
//
|
||||
// OBSIDIAN_PLATE("plateObsidian"),
|
||||
LAZURITE_PLATE("plateLazurite");
|
||||
BRASS_PLATE("plateBrass"),
|
||||
BRONZE_PLATE("plateBronze"),
|
||||
CARBON_PLATE("plateCarbon"),
|
||||
COAL_PLATE("plateCoal"),
|
||||
COPPER_PLATE("plateCopper"),
|
||||
DIAMOND_PLATE("plateDiamond"),
|
||||
ELECTRUM_PLATE("plateElectrum"),
|
||||
EMERALD_PLATE("plateEmerald"),
|
||||
GOLD_PLATE("plateGold"),
|
||||
INVAR_PLATE("plateInvar"),
|
||||
IRIDIUM_ALLOY_PLATE("plateIridiumAlloy"),
|
||||
IRIDIUM_PLATE("plateIridium"),
|
||||
IRON_PLATE("plateIron"),
|
||||
LAPIS_PLATE("plateLapis"),
|
||||
LAZURITE_PLATE("plateLazurite"),
|
||||
LEAD_PLATE("plateLead"),
|
||||
MAGNALIUM_PLATE("plateMagnalium"),
|
||||
NICKEL_PLATE("plateNickel"),
|
||||
OBSIDIAN_PLATE("plateObsidian"),
|
||||
PERIDOT_PLATE("platePeridot"),
|
||||
PLATINUM_PLATE("platePlatinum"),
|
||||
RED_GARNET_PLATE("plateRedGarnet"),
|
||||
REDSTONE_PLATE("plateRedstone"),
|
||||
REFINED_IRON_PLATE("plateRefinedIron"),
|
||||
RUBY_PLATE("plateRuby"),
|
||||
SAPPHIRE_PLATE("plateSapphire"),
|
||||
SILICON_PLATE("plateSilicon"),
|
||||
SILVER_PLATE("plateSilver"),
|
||||
STEEL_PLATE("plateSteel"),
|
||||
TIN_PLATE("plateTin"),
|
||||
TITANIUM_PLATE("plateTitanium"),
|
||||
TUNGSTEN_PLATE("plateTungsten"),
|
||||
TUNGSTENSTEEL_PLATE("plateTungstensteel"),
|
||||
WOOD_PLATE("plateWood"),
|
||||
YELLOW_GARNET_PLATE("plateYellowGarnet"),
|
||||
ZINC_PLATE("plateZinc");
|
||||
|
||||
public final ResourceLocation name;
|
||||
public final String name;
|
||||
public final Item item;
|
||||
|
||||
private ModPlates(String name) {
|
||||
this.name = new ResourceLocation(ModInfo.MOD_ID, name);
|
||||
this.item = new ItemPlates(this.name);
|
||||
this.name = name;
|
||||
this.item = new ItemPlates();
|
||||
// ModItems will take care about setRegistryName
|
||||
//this.item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
||||
this.item.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name.getPath();
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -104,19 +104,11 @@ public class OreDict {
|
|||
// ItemPlates.registerType(type);
|
||||
}
|
||||
|
||||
for (String type : ItemPlates.types) {
|
||||
// TODO: fix recipe
|
||||
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
|
||||
}
|
||||
// for (String type : ItemPlates.types) {
|
||||
// // TODO: fix recipe
|
||||
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
|
||||
// }
|
||||
|
||||
//Late registration of additional plates to keep meta
|
||||
// ItemPlates.registerType("magnalium");
|
||||
// OreUtil.registerOre("plateMagnalium", ItemPlates.getPlateByName("magnalium"));
|
||||
// TODO: Fix recipe
|
||||
// ItemPlates.registerType("iridium_alloy");
|
||||
// OreUtil.registerOre("plateIridiumAlloy", ItemPlates.getPlateByName("iridiumAlloy"));
|
||||
|
||||
|
||||
for (String type : ItemDusts.types) {
|
||||
OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue