more 1.7 work, attempts at figuring out log4j2

This commit is contained in:
Progwml6 committed 2014-01-10 17:03:06 -05:00
1 parent fb04e8eb08
commit d911af378f
33 files changed
+96 -81

No files matched your search

@@ -147,7 +147,7 @@ public class FilledBucket extends ItemBucket
world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type], metadata, 3); //TODO: Merge liquids
} catch (ArrayIndexOutOfBoundsException ex) {
TConstruct.logger.warning("AIOBE occured when placing bucket into world; " + ex);
TConstruct.logger.warn("AIOBE occured when placing bucket into world; " + ex);
return false;
}
@@ -156,7 +156,7 @@ public class FilledBucket extends ItemBucket
}
@Override
public void getSubItems (Block b, CreativeTabs tab, List list)
public void getSubItems (Item b, CreativeTabs tab, List list)
{
for (int i = 0; i < icons.length; i++)
list.add(new ItemStack(b, 1, i));
+1 -1
View File
@@ -17,7 +17,7 @@ import tconstruct.library.util.IPattern;
public class Pattern extends CraftingItem implements IPattern
{
public Pattern(int id, String patternType, String folder)
public Pattern(String patternType, String folder)
{
this(patternName, getPatternNames(patternType), folder);
}
@@ -105,8 +105,8 @@ public class Arrow extends ToolCore
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, "");
if (tool == null)
{
TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName());
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
}
else
{
@@ -127,8 +127,8 @@ public class Arrow extends ToolCore
{
if (!TRepo.supressMissingToolLogs)
{
TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName());
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
}
}
else
@@ -150,8 +150,8 @@ public class Arrow extends ToolCore
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName());
if (tool == null)
{
TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName());
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
}
else
{
@@ -52,7 +52,7 @@ public class Battleaxe extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, b, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.circuits, Material.cactus, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.cactus, Material.pumpkin };
@Override
public Item getHeadItem ()
@@ -773,8 +773,8 @@ public abstract class BowBase extends ToolCore
{
if (!TRepo.supressMissingToolLogs)
{
TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName());
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
}
}
else
@@ -37,7 +37,7 @@ public class Excavator extends HarvestTool
return "shovel";
}
static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay };
static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.crafedSnow, Material.clay };
@Override
public Item getHeadItem ()
@@ -67,7 +67,7 @@ public class Hammer extends HarvestTool
return materials;
}
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil };
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material. field_151574_g };
@Override
public Item getHeadItem ()
@@ -42,7 +42,7 @@ public class Hatchet extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.leaves, Material.field_151582_l, Material.circuits, Material.cactus, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.leaves, Material.field_151582_l, Material.field_151594_q, Material.cactus, Material.pumpkin };
@Override
public Item getHeadItem ()
@@ -62,7 +62,7 @@ public class LumberAxe extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.circuits, Material.cactus, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.cactus, Material.pumpkin };
/* Lumber axe specific */
@@ -47,7 +47,7 @@ public class Mattock extends DualHarvestTool
return "shovel";
}
static Material[] axeMaterials = { Material.field_151575_d, Material.cactus, Material.pumpkin, Material.plants, Material.vine };
static Material[] axeMaterials = { Material.field_151575_d, Material.cactus, Material.pumpkin, Material.plants, Material.field_151582_l };
static Material[] shovelMaterials = { Material.grass, Material.ground, Material.clay };
@Override
@@ -25,7 +25,7 @@ public class Pickaxe extends HarvestTool
return materials;
}
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits };
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.field_151574_g, Material.field_151594_q };
@Override
public Item getHeadItem ()