mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
This commit is contained in:
commit
30e51d33aa
3 files changed
+5
-78
No files matched your search
@@ -33,7 +33,7 @@ import tconstruct.worldgen.village.*;
|
||||
*/
|
||||
|
||||
@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
|
||||
{
|
||||
@@ -114,11 +114,11 @@ public class TConstruct
|
||||
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)
|
||||
{
|
||||
|
||||
@@ -1409,7 +1409,7 @@ public class TRecipes
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
TConstruct.logger.warning("Could not find " + name);
|
||||
TConstruct.logger.warning("Could not find " + name + "from " + classPackage);
|
||||
return 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<Character> 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';
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user