diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java index c12b3a532..aa9a46ca0 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java @@ -46,7 +46,7 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{ private String repairItem; public ItemAllToolAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ - super(5.0F, toolMat, allSet); + super(4.0F, toolMat, allSet); this.repairItem = repairItem; this.name = unlocalizedName; @@ -70,7 +70,8 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{ @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { if(KeyUtil.isShiftPressed()){ - list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".paxel.desc")); + list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".paxel.desc.1")); + list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".paxel.desc.2")); list.add(StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".durability.desc") + ": " + (this.getMaxDamage()-this.getDamage(stack)) + "/" + this.getMaxDamage()); } else list.add(ItemUtil.shiftForInfo()); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 6a37326bf..dcc8be7c7 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -123,14 +123,32 @@ tooltip.actuallyadditions.blockMiscLavaFactoryCase.desc=Helps the Lava Factory C tile.actuallyadditions.blockFluidPlacer.name=Fluid Placer tooltip.actuallyadditions.blockFluidPlacer.desc=Places Fluids stored inside it -tooltip.actuallyadditions.paxel.desc=It's an Axe, Shovel, Sword, Hoe and Pickaxe! Combined! -item.actuallyadditions.woodenPaxel.name=Wooden Paxelordoe -item.actuallyadditions.stonePaxel.name=Stone Paxelordoe -item.actuallyadditions.ironPaxel.name=Iron Paxelordoe -item.actuallyadditions.goldPaxel.name=Golden Paxelordoe -item.actuallyadditions.diamondPaxel.name=Diamond Paxelordoe -item.actuallyadditions.emeraldPaxel.name=Emerald Paxelordoe -item.actuallyadditions.obsidianPaxel.name=Obsidian Paxelordoe +tooltip.actuallyadditions.paxel.desc.1=It's an All-In-One-Tool! +tooltip.actuallyadditions.paxel.desc.2=Pickaxe, Axe, Shovel, Sword AND Hoe! In One Tool! +item.actuallyadditions.woodenPaxel.name=Wooden AIOT +item.actuallyadditions.stonePaxel.name=Stone AIOT +item.actuallyadditions.ironPaxel.name=Iron AIOT +item.actuallyadditions.goldPaxel.name=Golden AIOT +item.actuallyadditions.diamondPaxel.name=Diamond AIOT +item.actuallyadditions.emeraldPaxel.name=Emerald AIOT +item.actuallyadditions.obsidianPaxel.name=Obsidian AIOT + +item.actuallyadditions.paxelTFCopper.name=TF Copper AIOT +item.actuallyadditions.paxelTFTin.name=TF Tin AIOT +item.actuallyadditions.paxelTFLead.name=TF Lead AIOT +item.actuallyadditions.paxelTFSilver.name=TF Silver AIOT +item.actuallyadditions.paxelTFElectrum.name=TF Electrum AIOT +item.actuallyadditions.paxelTFNickel.name=TF Ferrous AIOT +item.actuallyadditions.paxelTFBronze.name=TF Bronze AIOT +item.actuallyadditions.paxelTFPlatinum.name=TF Shiny AIOT +item.actuallyadditions.paxelTFInvar.name=TF Invar AIOT + +item.actuallyadditions.paxelMTObsidian.name=MT Obsidian AIOT +item.actuallyadditions.paxelMTGlowstone.name=MT Glowstone AIOT +item.actuallyadditions.paxelMTLapisLazuli.name=MT Lapis Lazuli AIOT +item.actuallyadditions.paxelMTOsmium.name=MT Osmium AIOT +item.actuallyadditions.paxelMTBronze.name=MT Bronze AIOT +item.actuallyadditions.paxelMTSteel.name=MT Steel AIOT tile.actuallyadditions.blockFluidCollector.name=Fluid Collector tooltip.actuallyadditions.blockFluidCollector.desc=Stores Fluids in front of it inside it diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png new file mode 100644 index 000000000..26e5bb41b Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTGlowstone.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTGlowstone.png new file mode 100644 index 000000000..68ba56c32 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTGlowstone.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTLapisLazuli.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTLapisLazuli.png new file mode 100644 index 000000000..c6ddcedec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTLapisLazuli.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTObsidian.png new file mode 100644 index 000000000..1f2a4192e Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTObsidian.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTOsmium.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTOsmium.png new file mode 100644 index 000000000..09f276f30 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTOsmium.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTSteel.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTSteel.png new file mode 100644 index 000000000..e6fa305d8 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTSteel.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png new file mode 100644 index 000000000..544378513 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png new file mode 100644 index 000000000..a17df28de Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png new file mode 100644 index 000000000..f8fd4936d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFInvar.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFInvar.png new file mode 100644 index 000000000..53c63bddf Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFInvar.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png new file mode 100644 index 000000000..c12a7b28f Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png new file mode 100644 index 000000000..9272ffbe4 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFPlatinum.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFPlatinum.png new file mode 100644 index 000000000..e5cf9d762 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFPlatinum.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFSilver.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFSilver.png new file mode 100644 index 000000000..b0e8a6d11 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFSilver.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png new file mode 100644 index 000000000..07e82efe6 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png differ