From 06dadab7deb64960958f9b3e763d35763aba2436 Mon Sep 17 00:00:00 2001 From: Prometheus0000000 Date: Sat, 31 Oct 2020 00:50:22 -0400 Subject: [PATCH] Add more durable chisel --- src/main/java/team/chisel/Features.java | 4 ++++ .../java/team/chisel/config/Configurations.java | 5 +++++ src/main/java/team/chisel/init/ChiselItems.java | 1 + .../java/team/chisel/item/chisel/ItemChisel.java | 14 ++++++++------ src/main/resources/assets/chisel/lang/en_US.lang | 1 + .../chisel/textures/items/chisel_netherstar.png | Bin 0 -> 228 bytes 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/items/chisel_netherstar.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 5fde651f..82f6a4ba 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -461,9 +461,11 @@ public enum Features { ItemChisel chisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.IRON).setCreativeTab(ChiselTabs.tabChisel); ItemChisel diamondChisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.DIAMOND).setCreativeTab(ChiselTabs.tabChisel); ItemChisel obsidianChisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.OBSIDIAN).setCreativeTab(ChiselTabs.tabChisel); + ItemChisel netherStarChisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.NETHERSTAR).setCreativeTab(ChiselTabs.tabChisel); GameRegistry.registerItem(chisel, "chisel"); GameRegistry.registerItem(diamondChisel, "diamondChisel"); GameRegistry.registerItem(obsidianChisel, "obsidianChisel"); + GameRegistry.registerItem(netherStarChisel, "netherStarChisel"); } @Override @@ -472,10 +474,12 @@ public enum Features { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel), " YY", " YY", "X ", 'X', "stickWood", 'Y', "ingotIron")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.diamondChisel), " YY", " YY", "x ", 'x', "stickWood", 'Y', "gemDiamond")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.obsidianChisel), " YY", " YY", "x ", 'x', "stickWood", 'Y', Blocks.obsidian)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.netherStarChisel), " YY", " YY", "x ", 'x', "stickWood", 'Y', "netherStar")); } else { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel), " Y", "X ", 'X', "stickWood", 'Y', "ingotIron")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.diamondChisel), " Y", "X ", 'X', "stickWood", 'Y', "gemDiamond")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.obsidianChisel), " Y", "X ", 'X', "stickWood", 'Y', Blocks.obsidian)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.netherStarChisel), " YY", " YY", "x ", 'x', "stickWood", 'Y', "netherStar")); } } }, diff --git a/src/main/java/team/chisel/config/Configurations.java b/src/main/java/team/chisel/config/Configurations.java index 52ea33e5..93141c3c 100644 --- a/src/main/java/team/chisel/config/Configurations.java +++ b/src/main/java/team/chisel/config/Configurations.java @@ -44,11 +44,13 @@ public class Configurations { public static int ironChiselMaxDamage; public static int diamondChiselMaxDamage; public static int obsidianChiselMaxDamage; + public static int netherStarChiselMaxDamage; public static boolean ironChiselCanLeftClick; public static boolean ironChiselHasModes; public static int ironChiselAttackDamage; public static int diamondChiselAttackDamage; public static int obsidianChiselAttackDamage; + public static int netherStarChiselAttackDamage; public static boolean allowChiselCrossColors; public static boolean useRoadLineTool; @@ -102,6 +104,7 @@ public class Configurations { ironChiselMaxDamage = config.getInt("ironChiselMaxDamage", category, 500, 1, Short.MAX_VALUE, "The max damage of the standard iron chisel."); diamondChiselMaxDamage = config.getInt("diamondChiselMaxDamage", category, 5000, 1, Short.MAX_VALUE, "The max damage of the diamond chisel."); obsidianChiselMaxDamage = config.getInt("obsidianChiselMaxDamage", category, 2500, 1, Short.MAX_VALUE, "The max damage of the obsidian chisel."); + netherStarChiselMaxDamage = config.getInt("netherStarChiselMaxDamage", category, 32767, 1, Short.MAX_VALUE, "The max damage of the nether star chisel."); ironChiselCanLeftClick = config.get(category, "ironChiselCanLeftClick", true, "If this is true, the iron chisel can left click chisel blocks. If false, it cannot.").getBoolean(); ironChiselHasModes = config.get(category, "ironChiselHasModes", false, "If this is true, the iron chisel can change its chisel mode just as the diamond chisel can.").getBoolean(); allowChiselCrossColors = config.get(category, "allowChiselCrossColors", true, "Should someone be able to chisel something into a different color.").getBoolean(); @@ -112,6 +115,8 @@ public class Configurations { "The extra attack damage points (in half hearts) that the diamond chisel inflicts when it is used to attack an entity.").getInt(); obsidianChiselAttackDamage = config.get(category, "obsidianChiselAttackDamage", 4, "The extra attack damage points (in half hearts) that the obsidian chisel inflicts when it is used to attack an entity.").getInt(); + netherStarChiselAttackDamage = config.get(category, "netherStarChiselAttackDamage", 6, + "The extra attack damage points (in half hearts) that the obsidian chisel inflicts when it is used to attack an entity.").getInt(); /* block */ category = "block"; diff --git a/src/main/java/team/chisel/init/ChiselItems.java b/src/main/java/team/chisel/init/ChiselItems.java index 1809e04d..52adbb0f 100644 --- a/src/main/java/team/chisel/init/ChiselItems.java +++ b/src/main/java/team/chisel/init/ChiselItems.java @@ -14,6 +14,7 @@ public final class ChiselItems { public static final ItemChisel chisel = null; public static final ItemChisel diamondChisel = null; public static final ItemChisel obsidianChisel = null; + public static final ItemChisel netherStarChisel = null; public static final ItemCloudInABottle cloudinabottle = null; public static final ItemBallOMoss ballomoss = null; public static final ItemSmashingRock smashingrock = null; diff --git a/src/main/java/team/chisel/item/chisel/ItemChisel.java b/src/main/java/team/chisel/item/chisel/ItemChisel.java index 2a564760..f4417ea9 100644 --- a/src/main/java/team/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/team/chisel/item/chisel/ItemChisel.java @@ -30,7 +30,8 @@ public class ItemChisel extends Item implements IChiselItem { public enum ChiselType { IRON(Configurations.ironChiselMaxDamage, Configurations.ironChiselAttackDamage), DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage), - OBSIDIAN(Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage); + OBSIDIAN(Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage), + NETHERSTAR(Configurations.netherStarChiselMaxDamage, Configurations.netherStarChiselAttackDamage); final int maxDamage; final int attackDamage; @@ -74,8 +75,9 @@ public class ItemChisel extends Item implements IChiselItem { return repairMaterial.getItem().equals(Items.iron_ingot); case OBSIDIAN: return repairMaterial.getItem().equals(Item.getItemFromBlock(Blocks.obsidian)); + case NETHERSTAR: + return repairMaterial.getItem().equals(Items.nether_star); } - return false; } @@ -93,11 +95,11 @@ public class ItemChisel extends Item implements IChiselItem { String lc2 = I18n.format(base + "lc2"); String modes = I18n.format(base + "modes"); list.add(gui); - if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselCanLeftClick) { + if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || type == ChiselType.NETHERSTAR || Configurations.ironChiselCanLeftClick) { list.add(lc1); list.add(lc2); } - if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselHasModes) { + if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || type == ChiselType.NETHERSTAR || Configurations.ironChiselHasModes) { list.add(""); list.add(modes); } @@ -139,11 +141,11 @@ public class ItemChisel extends Item implements IChiselItem { @Override public boolean canChiselBlock(World world, EntityPlayer player, int x, int y, int z, Block block, int metadata) { - return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselCanLeftClick; + return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || type == ChiselType.NETHERSTAR || Configurations.ironChiselCanLeftClick; } @Override public boolean hasModes(ItemStack chisel) { - return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselHasModes; + return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || type == ChiselType.NETHERSTAR || Configurations.ironChiselHasModes; } } \ No newline at end of file diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 0fb12cd1..d0ee419d 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -16,6 +16,7 @@ item.chisel.chisel.desc.modes=Has multiple modes for chiseling. item.chisel.chisel_diamond.name=Diamond Chisel item.chisel.chisel_obsidian.name=Obsidian Chisel +item.chisel.chisel_netherstar.name=Nether Star Chisel item.ballMoss.name=Ball O' Moss item.ballMoss.desc=Right-Click to throw. This will turn Cobblestone to Moss Stone on impact. diff --git a/src/main/resources/assets/chisel/textures/items/chisel_netherstar.png b/src/main/resources/assets/chisel/textures/items/chisel_netherstar.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7473c876efe13247cb2215b4e7ef688bde8011 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>?NMQuIx{^p zsl>l#gOl41nauZi^nbryi*OFd%~{#HGY_&&SR%P(qR!b9Y!jAB+I~23$z}lq!-*9| Vv)Ep&a|c?_;OXk;vd$@?2>_mXOIrW{ literal 0 HcmV?d00001