Skip to content

Commit

Permalink
I am a derp
Browse files Browse the repository at this point in the history
  • Loading branch information
dries007 committed Jul 8, 2016
1 parent 654c6d2 commit 62716fd
Show file tree
Hide file tree
Showing 34 changed files with 20 additions and 20 deletions.
10 changes: 4 additions & 6 deletions src/main/java/net/doubledoordev/lumberjack/Lumberjack.java
Expand Up @@ -100,11 +100,10 @@ public void init(FMLInitializationEvent event)
logger.error("Found horribly broken axe {} with material {}. Please report.", i.getRegistryName(), m);
continue;
}
logger.info("Found an axe {} with material {} ({})", i.getRegistryName(), m, ItemLumberAxe.normalizeName(m));

if (!unusedMaterials.remove(m) || ItemLumberAxe.usedMaterial(m))
{
logger.info("Material {} already in use.", m);
logger.debug("Material {} ({}) already in use.", m, ItemLumberAxe.normalizeName(m));
continue;
}

Expand All @@ -114,7 +113,7 @@ public void init(FMLInitializationEvent event)
}
catch (Exception e)
{
logger.error("Something went wrong registering a lumberaxe. This is not a crash, the lumberaxe for axe '" + i.getRegistryName() + "' will not exist. Please report.", e);
logger.warn("New Lumberaxe error. Axe trying to imitate: " + i.getRegistryName(), e);
}
}

Expand All @@ -130,11 +129,10 @@ public void init(FMLInitializationEvent event)
logger.error("Found horribly broken material {}. Please report.", m);
continue;
}
logger.info("Found an unused material {} ({})", m, ItemLumberAxe.normalizeName(m));

if (ItemLumberAxe.usedMaterial(m))
{
logger.info("Material {} already in use, probably under a (differently) prefixed name.", m);
logger.debug("Material {} ({}) already in use.", m, ItemLumberAxe.normalizeName(m));
continue;
}

Expand All @@ -144,7 +142,7 @@ public void init(FMLInitializationEvent event)
}
catch (Exception e)
{
logger.warn("Something went wrong registering a lumberaxe. This is not a crash, the lumberaxe for ToolMaterial '" + m + "' will not exist.", e);
logger.warn("New Lumberaxe error. ToolMaterial '" + m + "' will not exist.", e);
}
}
}
Expand Down
Expand Up @@ -93,7 +93,7 @@ public static ItemStack getRepairStack(ToolMaterial m)
*/
public static String normalizeName(ToolMaterial toolMaterial)
{
String name = toolMaterial.name().toLowerCase().replaceAll("tools?|materials?|(battle)?(sword|axe|hoe|pick(axe)?|shovel|hammer)", "").replaceAll("[_|: ]", " ").trim();
String name = toolMaterial.name().toLowerCase().replaceAll("tools?|materials?|(battle)?(sword|axe|hoe|pick(axe)?|shovel|hammer)", "").replaceAll("[_|:]+", " ").trim();
if (name.indexOf(' ') != -1) name = name.substring(name.indexOf(' ') + 1);
return name;
}
Expand All @@ -103,6 +103,7 @@ public static String normalizeName(ToolMaterial toolMaterial)
public ItemLumberAxe(ToolMaterial m, ItemAxe axe) throws IllegalAccessException
{
this(m, true);
Lumberjack.getLogger().info("New LumberAxe {} ({}) From axe {}", toolMaterial, materialName, axe.getRegistryName());
setProperty(efficiencyOnProperMaterialField, axe);
setProperty(damageVsEntityField, axe);
setProperty(attackSpeedField, axe);
Expand All @@ -111,6 +112,7 @@ public ItemLumberAxe(ToolMaterial m, ItemAxe axe) throws IllegalAccessException
public ItemLumberAxe(ToolMaterial m)
{
this(m, false);
Lumberjack.getLogger().info("New LumberAxe {} ({}) From Material", toolMaterial, materialName);
}

/**
Expand Down
@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/electrum_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/adamantine_lumberaxe"}}
@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/mithril_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/aquarium_lumberaxe"}}
@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/dancium_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/coldIron_lumberaxe"}}
@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/adamantine_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/cupronickel_lumberaxe"}}

This file was deleted.

@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/nickel_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/dancium_lumberaxe"}}
@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/coldIron_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/electrum_lumberaxe"}}
@@ -0,0 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/kanekium_lumberaxe"}}

This file was deleted.

@@ -0,0 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/kinnoium_lumberaxe"}}

This file was deleted.

@@ -1 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/aquarium_lumberjack"}}
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/lenthurium_lumberaxe"}}

This file was deleted.

@@ -0,0 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/mithril_lumberaxe"}}
@@ -0,0 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/nickel_lumberaxe"}}
@@ -0,0 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/plantmetal_lumberaxe"}}

This file was deleted.

@@ -0,0 +1 @@
{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/platinum_lumberaxe"}}

This file was deleted.

0 comments on commit 62716fd

Please sign in to comment.