diff --git a/src/main/java/mod/chiselsandbits/blueprints/EntityBlueprint.java b/src/main/java/mod/chiselsandbits/blueprints/EntityBlueprint.java index 23709b67..d49ce971 100644 --- a/src/main/java/mod/chiselsandbits/blueprints/EntityBlueprint.java +++ b/src/main/java/mod/chiselsandbits/blueprints/EntityBlueprint.java @@ -123,7 +123,7 @@ public EnumActionResult hitWithTool( { // deployment - if ( usingHammer( handStack ) ) + if ( usingMallet( handStack ) ) { beginPlacement( player ); return EnumActionResult.SUCCESS; @@ -198,7 +198,7 @@ else if ( handStack.getItem() == ChiselsAndBits.getItems().itemWrench ) { // capture - if ( usingHammer( handStack ) ) + if ( usingMallet( handStack ) ) { beginCapture( player ); return EnumActionResult.SUCCESS; @@ -279,10 +279,10 @@ private void sendUpdate() NetworkRouter.instance.sendToServer( getConfiguration() ); } - private boolean usingHammer( + private boolean usingMallet( ItemStack handStack ) { - return ModUtil.notEmpty( handStack ) && handStack.getItem() == ChiselsAndBits.getItems().itemHammer; + return ModUtil.notEmpty( handStack ) && handStack.getItem() == ChiselsAndBits.getItems().itemMallet; } private void adjustSize( diff --git a/src/main/java/mod/chiselsandbits/core/ClientSide.java b/src/main/java/mod/chiselsandbits/core/ClientSide.java index 825c5106..fdd43052 100644 --- a/src/main/java/mod/chiselsandbits/core/ClientSide.java +++ b/src/main/java/mod/chiselsandbits/core/ClientSide.java @@ -286,6 +286,7 @@ public void registerItemModels() registerMesh( modItems.itemChiselDiamond, 0, new ModelResourceLocation( new ResourceLocation( modId, "chisel_diamond" ), "inventory" ) ); registerMesh( modItems.itemBitBag, 0, new ModelResourceLocation( new ResourceLocation( modId, "bit_bag" ), "inventory" ) ); registerMesh( modItems.itemWrench, 0, new ModelResourceLocation( new ResourceLocation( modId, "wrench_wood" ), "inventory" ) ); + registerMesh( modItems.itemMallet, 0, new ModelResourceLocation( new ResourceLocation( modId, "mallet_wood" ), "inventory" ) ); registerMesh( modItems.itemBitSawDiamond, 0, new ModelResourceLocation( new ResourceLocation( modId, "bitsaw_diamond" ), "inventory" ) ); registerMesh( modItems.itemTapeMeasure, 0, new ModelResourceLocation( new ResourceLocation( modId, "tape_measure" ), "inventory" ) ); diff --git a/src/main/java/mod/chiselsandbits/helpers/LocalStrings.java b/src/main/java/mod/chiselsandbits/helpers/LocalStrings.java index 21a0c0f6..ca6bca90 100644 --- a/src/main/java/mod/chiselsandbits/helpers/LocalStrings.java +++ b/src/main/java/mod/chiselsandbits/helpers/LocalStrings.java @@ -97,7 +97,7 @@ public enum LocalStrings BitOptionPlace( "bitoption.place" ), BitOptionReplace( "bitoption.replace" ), - HelpHammer( "help.hammer" ); + HelpMallet( "help.mallet" ); private final String string; diff --git a/src/main/java/mod/chiselsandbits/items/ItemHammer.java b/src/main/java/mod/chiselsandbits/items/ItemMallet.java similarity index 87% rename from src/main/java/mod/chiselsandbits/items/ItemHammer.java rename to src/main/java/mod/chiselsandbits/items/ItemMallet.java index d5af08db..5225c570 100644 --- a/src/main/java/mod/chiselsandbits/items/ItemHammer.java +++ b/src/main/java/mod/chiselsandbits/items/ItemMallet.java @@ -4,7 +4,9 @@ import mod.chiselsandbits.blueprints.EntityBlueprint; import mod.chiselsandbits.core.ChiselsAndBits; +import mod.chiselsandbits.core.ClientSide; import mod.chiselsandbits.helpers.LocalStrings; +import net.minecraft.client.Minecraft; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -18,10 +20,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemHammer extends Item +public class ItemMallet extends Item { - public ItemHammer() + public ItemMallet() { setMaxStackSize( 1 ); } @@ -77,7 +79,7 @@ public void addInformation( final ITooltipFlag advanced ) { super.addInformation( stack, worldIn, tooltip, advanced ); - ChiselsAndBits.getConfig().helpText( LocalStrings.HelpHammer, tooltip ); + ChiselsAndBits.getConfig().helpText( LocalStrings.HelpMallet, tooltip, ClientSide.instance.getKeyName( Minecraft.getMinecraft().gameSettings.keyBindUseItem ) ); } } diff --git a/src/main/java/mod/chiselsandbits/registry/ModItems.java b/src/main/java/mod/chiselsandbits/registry/ModItems.java index 548e6fd9..4fb12571 100644 --- a/src/main/java/mod/chiselsandbits/registry/ModItems.java +++ b/src/main/java/mod/chiselsandbits/registry/ModItems.java @@ -7,7 +7,7 @@ import mod.chiselsandbits.items.ItemBitSaw; import mod.chiselsandbits.items.ItemChisel; import mod.chiselsandbits.items.ItemChiseledBit; -import mod.chiselsandbits.items.ItemHammer; +import mod.chiselsandbits.items.ItemMallet; import mod.chiselsandbits.items.ItemMirrorPrint; import mod.chiselsandbits.items.ItemNegativePrint; import mod.chiselsandbits.items.ItemPositivePrint; @@ -29,7 +29,7 @@ public class ModItems extends ModRegistry final public ItemNegativePrint itemNegativeprint; final public ItemBlueprint itemBlueprint; - final public ItemHammer itemHammer; + final public ItemMallet itemMallet; final public ItemBitBag itemBitBag; final public ItemWrench itemWrench; @@ -52,7 +52,7 @@ public ModItems( itemBitSawDiamond = registerItem( config.enableBitSaw, new ItemBitSaw(), "bitsaw_diamond" ); itemBlockBit = registerItem( config.enableChisledBits, new ItemChiseledBit(), "block_bit" ); itemBlueprint = registerItem( config.enableBlueprints, new ItemBlueprint(), "blueprint" ); - itemHammer = registerItem( config.enableBlueprints, new ItemHammer(), "hammer" ); + itemMallet = registerItem( config.enableBlueprints, new ItemMallet(), "mallet_wood" ); itemTapeMeasure = registerItem( config.enableTapeMeasure, new ItemTapeMeasure(), "tape_measure" ); registerItem( config.enableAPITestingItem, new ItemApiDebug(), "debug" ); } diff --git a/src/main/resources/assets/chiselsandbits/lang/en_us.lang b/src/main/resources/assets/chiselsandbits/lang/en_us.lang index 6f6dddb7..bfad6602 100644 --- a/src/main/resources/assets/chiselsandbits/lang/en_us.lang +++ b/src/main/resources/assets/chiselsandbits/lang/en_us.lang @@ -22,6 +22,8 @@ tile.mod.chiselsandbits.bittank.name=Chiseled Fluid Bit Tank item.mod.chiselsandbits.block_bit.name=Chiseled Bit item.mod.chiselsandbits.bit_bag.name=Chiseled Bit Bag item.mod.chiselsandbits.wrench_wood.name=Wooden Wrench + +item.mod.chiselsandbits.mallet_wood.name=Mallet item.mod.chiselsandbits.blueprint.name=Blueprint item.mod.chiselsandbits.blueprint_written.name=Blueprint - Written @@ -103,6 +105,7 @@ mod.chiselsandbits.help.filled=Filled mod.chiselsandbits.help.chiseled_block={} to place;{} to ignore block grid;Mouse Wheel to cycle placement rotation. mod.chiselsandbits.help.bit_bag=Automatically re-stock, and store bits. mod.chiselsandbits.help.wrench={} blocks to rotate. +mod.chiselsandbits.help.mallet={} to write/construct blue prints. mod.chiselsandbits.help.bit={} to chisel;{} to place;Use {} to display menu. mod.chiselsandbits.help.positiveprint={} to write;{} to chisel/place or Craft with bits/bags.;Mouse Wheel to cycle rotation;Use {} to display menu. mod.chiselsandbits.help.negativeprint={} to write;{} to chisel.;Mouse Wheel to cycle rotation. diff --git a/src/main/resources/assets/chiselsandbits/models/item/mallet_wood.json b/src/main/resources/assets/chiselsandbits/models/item/mallet_wood.json new file mode 100644 index 00000000..837eacaf --- /dev/null +++ b/src/main/resources/assets/chiselsandbits/models/item/mallet_wood.json @@ -0,0 +1,6 @@ +{ + "parent":"chiselsandbits:item/tool", + "textures": { + "layer0":"chiselsandbits:items/mallet_wood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chiselsandbits/recipes/mallet_wood.json b/src/main/resources/assets/chiselsandbits/recipes/mallet_wood.json new file mode 100644 index 00000000..94d97b26 --- /dev/null +++ b/src/main/resources/assets/chiselsandbits/recipes/mallet_wood.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "chiselsandbits:mallet_wood" + }, + "pattern": [ + "WS" + ], + "type": "minecraft:crafting_shaped", + "key": { + "S": { + "type": "forge:ore_dict", + "ore": "stickWood" + }, + "W": { + "type": "forge:ore_dict", + "ore": "plankWood" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chiselsandbits/textures/items/mallet_wood.png b/src/main/resources/assets/chiselsandbits/textures/items/mallet_wood.png new file mode 100644 index 00000000..6304f6b0 Binary files /dev/null and b/src/main/resources/assets/chiselsandbits/textures/items/mallet_wood.png differ