diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 738e7ee2c5b..6a0452c849c 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -33,7 +33,7 @@ */ @Mod(modid = "TConstruct", name = "TConstruct", version = "${version}", - dependencies = "required-after:Forge@[8.9,);required-after:Mantle;after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") + dependencies = "required-after:Forge@[9.11,);required-after:Mantle;after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { @@ -116,11 +116,11 @@ public void preInit (FMLPreInitializationEvent event) VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); try { - if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4")) - { + // if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4")) + // { MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure"); MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure"); - } + // } } catch (Throwable e) { diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index ba8700dea3a..315935fcd5f 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -1409,7 +1409,7 @@ public static Object getStaticItem (String name, String classPackage) } catch (Exception e) { - TConstruct.logger.warning("Could not find " + name); + TConstruct.logger.warning("Could not find " + name + "from " + classPackage); return null; } } diff --git a/src/main/java/tconstruct/util/DozenalConverter.java b/src/main/java/tconstruct/util/DozenalConverter.java deleted file mode 100644 index a1f37466bb9..00000000000 --- a/src/main/java/tconstruct/util/DozenalConverter.java +++ /dev/null @@ -1,73 +0,0 @@ -package tconstruct.util; - -import java.util.LinkedList; - -public class DozenalConverter -{ - public static String convertToDozenal (byte i) - { - return convertDecimal(i); - } - - public static String convertToDozenal (short i) - { - return convertDecimal(i); - } - - public static String convertToDozenal (int i) - { - return convertDecimal(i); - } - - public static String convertDecimal (int i) - { - int num = i; - LinkedList list = new LinkedList(); - while (num > 0) - { - list.add(getDozenalCharacter(num % 12)); - num /= 12; - } - StringBuilder builder = new StringBuilder(); - for (int iter = list.size() - 1; iter > 0; iter--) - { - builder.append(list.get(iter)); - } - return builder.toString(); - } - - public static char getDozenalCharacter (int i) - { - assert i < 12 : "Base 10 number should be less than 12"; - - switch (i) - { - case 0: - return '0'; //Zero - case 1: - return '1'; //One - case 2: - return '2'; //Two - case 3: - return '3'; //Three - case 4: - return '4'; //Four - case 5: - return '5'; //Five - case 6: - return '6'; //Six - case 7: - return '7'; //Seven - case 8: - return '8'; //Eight - case 9: - return '9'; //Nine - case 10: - return 'X'; //Dec - case 11: - return 'E'; //El - } - - return 'Q'; - } -}