From fc7a9e269766405738f356cdadd54634d4217820 Mon Sep 17 00:00:00 2001 From: Walrus Date: Sat, 21 Dec 2024 20:36:30 -0500 Subject: [PATCH] [pickaxe] commit for history --- .../27b8b1d6af601e15f202616061490ff2b85aa40c | 6 +- .../CustomItems/LongReachPicks.java | 29 +++++++++ .../CustomItems/PickAxeMaker.java | 59 ++++++++++++++++++ .../CustomItems/PickAxeRegister.java | 9 +++ .../java/jesse/keeblarcraft/Keeblarcraft.java | 4 ++ .../assets/keeblarcraft/lang/en_us.json | 5 +- .../models/item/longdiamondpick.json | 6 ++ .../textures/item/longdiamondpick.png | Bin 0 -> 296 bytes 8 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 src/main/java/jesse/keeblarcraft/CustomItems/LongReachPicks.java create mode 100644 src/main/java/jesse/keeblarcraft/CustomItems/PickAxeMaker.java create mode 100644 src/main/java/jesse/keeblarcraft/CustomItems/PickAxeRegister.java create mode 100644 src/main/resources/assets/keeblarcraft/models/item/longdiamondpick.json create mode 100644 src/main/resources/assets/keeblarcraft/textures/item/longdiamondpick.png diff --git a/src/main/generated/.cache/27b8b1d6af601e15f202616061490ff2b85aa40c b/src/main/generated/.cache/27b8b1d6af601e15f202616061490ff2b85aa40c index 0a694d0..3883a0c 100644 --- a/src/main/generated/.cache/27b8b1d6af601e15f202616061490ff2b85aa40c +++ b/src/main/generated/.cache/27b8b1d6af601e15f202616061490ff2b85aa40c @@ -1,3 +1,3 @@ -// 1.20 2024-12-05T22:38:15.935314478 keeblarcraft/Keeblarcraft World Generation -afc3340283d1101601bd4d2ca96341a58eceaf83 data/keeblarcraft/dimension_type/keeblarcraftdim_type.json -4398eda2b0c28b2c754c45f5805534bf1921b243 data/keeblarcraft/worldgen/biome/test_biome.json +// 1.20 2024-12-07T18:09:44.8464937 keeblarcraft/Keeblarcraft World Generation +4398eda2b0c28b2c754c45f5805534bf1921b243 data\keeblarcraft\worldgen\biome\test_biome.json +afc3340283d1101601bd4d2ca96341a58eceaf83 data\keeblarcraft\dimension_type\keeblarcraftdim_type.json diff --git a/src/main/java/jesse/keeblarcraft/CustomItems/LongReachPicks.java b/src/main/java/jesse/keeblarcraft/CustomItems/LongReachPicks.java new file mode 100644 index 0000000..1d968e1 --- /dev/null +++ b/src/main/java/jesse/keeblarcraft/CustomItems/LongReachPicks.java @@ -0,0 +1,29 @@ +package jesse.keeblarcraft.CustomItems; + + + +import java.util.List; + +import org.jetbrains.annotations.Nullable; + +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PickaxeItem; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +public class LongReachPicks extends Item { + //Creation of Items + public final static Item longDiamondPick = new PickaxeItem(PickAxeMaker.LONG_DIAMOND_PICK, 2, 2, new Item.Settings()); + + LongReachPicks(Settings settings) { + super(settings); + } + + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + tooltip.add(Text.translatable("longpick.tooltip").formatted(Formatting.GOLD)); + } +} diff --git a/src/main/java/jesse/keeblarcraft/CustomItems/PickAxeMaker.java b/src/main/java/jesse/keeblarcraft/CustomItems/PickAxeMaker.java new file mode 100644 index 0000000..b49c1bc --- /dev/null +++ b/src/main/java/jesse/keeblarcraft/CustomItems/PickAxeMaker.java @@ -0,0 +1,59 @@ +package jesse.keeblarcraft.CustomItems; + +import java.util.function.Supplier; + +import net.fabricmc.yarn.constants.MiningLevels; +import net.minecraft.item.Items; +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public enum PickAxeMaker implements ToolMaterial { + LONG_DIAMOND_PICK(MiningLevels.DIAMOND, 650, 4.5f, 3.0f, 26, () -> Ingredient.ofItems(Items.ENDER_EYE)); + + private final int miningLevel; + private final int itemDurability; + private final float miningSpeed; + private final float attackDamage; + public final int enchantability; + private final Supplier repairIngredient; + + PickAxeMaker(int MiningLevel, int ItemDurability, float MiningSpeed, float AttackDamage, int Enchantability, Supplier RepairIngredient) { + this.miningLevel = MiningLevel; + this.itemDurability = ItemDurability; + this.miningSpeed = MiningSpeed; + this.attackDamage = AttackDamage; + this.enchantability = Enchantability; + this.repairIngredient = RepairIngredient; + } + + @Override + public float getAttackDamage() { + return this.attackDamage; + } + + @Override + public int getDurability() { + return this.itemDurability; + } + + @Override + public int getEnchantability() { + return this.enchantability; + } + + @Override + public int getMiningLevel() { + return this.miningLevel; + } + + @Override + public float getMiningSpeedMultiplier() { + return this.miningSpeed; + } + + @Override + public Ingredient getRepairIngredient() { + return this.repairIngredient.get(); + } + +} diff --git a/src/main/java/jesse/keeblarcraft/CustomItems/PickAxeRegister.java b/src/main/java/jesse/keeblarcraft/CustomItems/PickAxeRegister.java new file mode 100644 index 0000000..29e7598 --- /dev/null +++ b/src/main/java/jesse/keeblarcraft/CustomItems/PickAxeRegister.java @@ -0,0 +1,9 @@ +package jesse.keeblarcraft.CustomItems; + + +public class PickAxeRegister { + + public static void registerHandhelds() { + ItemManager.RegisterItem("longdiamondpick", LongReachPicks.longDiamondPick); + } +} diff --git a/src/main/java/jesse/keeblarcraft/Keeblarcraft.java b/src/main/java/jesse/keeblarcraft/Keeblarcraft.java index 5360ce4..13753d1 100644 --- a/src/main/java/jesse/keeblarcraft/Keeblarcraft.java +++ b/src/main/java/jesse/keeblarcraft/Keeblarcraft.java @@ -44,6 +44,7 @@ import jesse.keeblarcraft.CustomBlocks.BlockList; // import jesse.keeblarcraft.CustomBlocks.BlockEntities.MagicChestBlockEntity; // import jesse.keeblarcraft.CustomBlocks.Blocks.MagicChestBlock; import jesse.keeblarcraft.CustomItems.ItemManager; +import jesse.keeblarcraft.CustomItems.PickAxeRegister; import jesse.keeblarcraft.EventMgr.DimensionLoadingEvent; import jesse.keeblarcraft.EventMgr.PlayerJoinListener; import jesse.keeblarcraft.EventMgr.ServerTickListener; @@ -130,6 +131,9 @@ public class Keeblarcraft implements ModInitializer { // Register attributes AttributeMgr.RegisterAttributes(); + // Register Handhelds <== put any handhelds inside this class and make static + PickAxeRegister.registerHandhelds(); + // Register the banking system BankManager.GetInstance().InitializeBanks(); diff --git a/src/main/resources/assets/keeblarcraft/lang/en_us.json b/src/main/resources/assets/keeblarcraft/lang/en_us.json index bbdf2ed..967e317 100644 --- a/src/main/resources/assets/keeblarcraft/lang/en_us.json +++ b/src/main/resources/assets/keeblarcraft/lang/en_us.json @@ -3,6 +3,7 @@ "item.keeblarcraft.metaljacket_chestplate": "MetalJacket Chestplate", "item.keeblarcraft.metaljacket_leggings": "MetalJacket Leggings", "item.keeblarcraft.metaljacket_boots": "MetalJacket Booties", + "item.keeblarcraft.longdiamondpick": "Long Diamond Pick", "itemgroup.keeblarcraft": "Keeblarcraft Modded Items", @@ -12,5 +13,7 @@ "category.keeblarcraft.test": "Keeblarcraft bindings", "key.keeblarcraft.treemap": "Tree GUI", - "key.keeblarcraft.globalconfig": "Config menu" + "key.keeblarcraft.globalconfig": "Config menu", + + "longpick.tooltip": "LOONG PICK" } \ No newline at end of file diff --git a/src/main/resources/assets/keeblarcraft/models/item/longdiamondpick.json b/src/main/resources/assets/keeblarcraft/models/item/longdiamondpick.json new file mode 100644 index 0000000..5d162cb --- /dev/null +++ b/src/main/resources/assets/keeblarcraft/models/item/longdiamondpick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "keeblarcraft:item/longdiamondpick" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/keeblarcraft/textures/item/longdiamondpick.png b/src/main/resources/assets/keeblarcraft/textures/item/longdiamondpick.png new file mode 100644 index 0000000000000000000000000000000000000000..fcaeb83d6e9cd905bc94001df72b1d13ff5b30cb GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$YCrFa(7}_cTVOdki(Mh=gnPbA`x!u&na}ofWxVH zOZ5N$_gQ_s(?kwRG;3W6xuc@`>i`dr;^Z%0TO|dzEq{_1v?RYM=ydDExBW|w9$qsg z`tO!$?-$lh4V&gQaWb#Vml