From f463416c0cfa102fa966b4483d4928203a6bfcf2 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 26 Jun 2014 20:18:03 +0100 Subject: [PATCH] Metallurgy was easier than expected. --- .../rebelkeithy/mods/metallurgy/api/IMetalSet.java | 0 .../rebelkeithy/mods/metallurgy/api/IOreInfo.java | 4 ++++ .../mods/metallurgy/api/MetallurgyAPI.java | 13 ++++++++++--- .../rebelkeithy/mods/metallurgy/api/OreType.java | 0 4 files changed, 14 insertions(+), 3 deletions(-) rename src/{main => api}/java/rebelkeithy/mods/metallurgy/api/IMetalSet.java (100%) rename src/{main => api}/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java (91%) rename src/{main => api}/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java (77%) rename src/{main => api}/java/rebelkeithy/mods/metallurgy/api/OreType.java (100%) diff --git a/src/main/java/rebelkeithy/mods/metallurgy/api/IMetalSet.java b/src/api/java/rebelkeithy/mods/metallurgy/api/IMetalSet.java similarity index 100% rename from src/main/java/rebelkeithy/mods/metallurgy/api/IMetalSet.java rename to src/api/java/rebelkeithy/mods/metallurgy/api/IMetalSet.java diff --git a/src/main/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java b/src/api/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java similarity index 91% rename from src/main/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java rename to src/api/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java index b043e2496..4571c9bc4 100644 --- a/src/main/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java +++ b/src/api/java/rebelkeithy/mods/metallurgy/api/IOreInfo.java @@ -36,4 +36,8 @@ public interface IOreInfo public OreType getType(); public boolean isEnabled(); + + public int getBlockHarvestLevel(); + + public int getToolHarvestLevel(); } diff --git a/src/main/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java b/src/api/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java similarity index 77% rename from src/main/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java rename to src/api/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java index 333438754..af6cfa926 100644 --- a/src/main/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java +++ b/src/api/java/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java @@ -6,12 +6,19 @@ public class MetallurgyAPI { // Values for name: "base", "precious", "nether", "fantasy", "ender", - // "utility" + // "utility", "vanilla" public static IMetalSet getMetalSet(String name) { try { - final Class metallurgyMetals = Class.forName("rebelkeithy.mods.metallurgy.metals.MetallurgyMetals"); + String className = "rebelkeithy.mods.metallurgy.metals.MetallurgyMetals"; + + if (name.equals("vanilla")) + { + className = "rebelkeithy.mods.metallurgy.vanilla.MetallurgyVanilla"; + } + + final Class metallurgyMetals = Class.forName(className); final Field set = metallurgyMetals.getField(name + "Set"); return (IMetalSet) set.get(null); } catch (final NoSuchFieldException e) @@ -43,7 +50,7 @@ public class MetallurgyAPI { // TODO maybe put something to get runtime list here final String[] names = - { "base", "precious", "nether", "fantasy", "ender", "utility" }; + { "base", "precious", "nether", "fantasy", "ender", "utility", "vanilla" }; return names; } } diff --git a/src/main/java/rebelkeithy/mods/metallurgy/api/OreType.java b/src/api/java/rebelkeithy/mods/metallurgy/api/OreType.java similarity index 100% rename from src/main/java/rebelkeithy/mods/metallurgy/api/OreType.java rename to src/api/java/rebelkeithy/mods/metallurgy/api/OreType.java