diff --git a/src/main/java/com/jenny/compressedblocks/CompressedBlocks.java b/src/main/java/com/jenny/compressedblocks/CompressedBlocks.java index cb4d61d..45fb833 100755 --- a/src/main/java/com/jenny/compressedblocks/CompressedBlocks.java +++ b/src/main/java/com/jenny/compressedblocks/CompressedBlocks.java @@ -58,7 +58,12 @@ public class CompressedBlocks output.accept(ModBlocks.GRANITE_3X.get()); output.accept(ModBlocks.GRANITE_4X.get()); output.accept(ModBlocks.CBLOCK_MINING.get()); + + output.accept(Tools.ULTRA_SWORD.get()); output.accept(Tools.ULTRA_PICKAXE.get()); + output.accept(Tools.ULTRA_AXE.get()); + output.accept(Tools.ULTRA_SHOVEL.get()); + output.accept(Tools.ULTRA_HOE.get()); }).build()); public CompressedBlocks() diff --git a/src/main/java/com/jenny/compressedblocks/datagen/ModItemModelProvider.java b/src/main/java/com/jenny/compressedblocks/datagen/ModItemModelProvider.java index e11c12b..97816c9 100644 --- a/src/main/java/com/jenny/compressedblocks/datagen/ModItemModelProvider.java +++ b/src/main/java/com/jenny/compressedblocks/datagen/ModItemModelProvider.java @@ -19,7 +19,11 @@ public class ModItemModelProvider extends ItemModelProvider { @Override protected void registerModels() { + handheldItem(Tools.ULTRA_SWORD); handheldItem(Tools.ULTRA_PICKAXE); + handheldItem(Tools.ULTRA_AXE); + handheldItem(Tools.ULTRA_SHOVEL); + handheldItem(Tools.ULTRA_HOE); } private ItemModelBuilder saplingItem(RegistryObject item) { diff --git a/src/main/java/com/jenny/compressedblocks/moditems/ToolTiers.java b/src/main/java/com/jenny/compressedblocks/moditems/ToolTiers.java index 2537e46..6de0992 100644 --- a/src/main/java/com/jenny/compressedblocks/moditems/ToolTiers.java +++ b/src/main/java/com/jenny/compressedblocks/moditems/ToolTiers.java @@ -14,7 +14,7 @@ import java.util.List; public class ToolTiers { public static final Tier ULTRA = TierSortingRegistry.registerTier( - new ForgeTier(5, 2560, 20f, 4f, 25, + new ForgeTier(4, 2560, 12.0f, 5.0f, 25, Tags.Blocks.NEEDS_ULTRA_TOOL, () -> Ingredient.of(ModBlocks.CBLOCK_MINING_ITEM.get())), new ResourceLocation(CompressedBlocks.MODID, "ultra"), List.of(Tiers.NETHERITE), List.of() ); diff --git a/src/main/java/com/jenny/compressedblocks/moditems/Tools.java b/src/main/java/com/jenny/compressedblocks/moditems/Tools.java index c32c18f..0dbf71f 100644 --- a/src/main/java/com/jenny/compressedblocks/moditems/Tools.java +++ b/src/main/java/com/jenny/compressedblocks/moditems/Tools.java @@ -11,9 +11,11 @@ public class Tools { public static final DeferredRegister TOOLS = DeferredRegister.create(ForgeRegistries.ITEMS, CompressedBlocks.MODID); - public static final RegistryObject ULTRA_PICKAXE = TOOLS.register("ultra_pickaxe", () -> new PickaxeItem(ToolTiers.ULTRA, 1, -2.5f, new Item.Properties())); - - + public static final RegistryObject ULTRA_SWORD = TOOLS.register("ultra_sword", () -> new SwordItem(ToolTiers.ULTRA, 3, -2.4f, new Item.Properties().fireResistant())); + public static final RegistryObject ULTRA_PICKAXE = TOOLS.register("ultra_pickaxe", () -> new PickaxeItem(ToolTiers.ULTRA, 1, -2.8f, new Item.Properties().fireResistant())); + public static final RegistryObject ULTRA_AXE = TOOLS.register("ultra_axe", () -> new AxeItem(ToolTiers.ULTRA, 5.0f, -2.5f, new Item.Properties().fireResistant())); + public static final RegistryObject ULTRA_SHOVEL = TOOLS.register("ultra_shovel", () -> new ShovelItem(ToolTiers.ULTRA, 1.5f, -3.0f, new Item.Properties().fireResistant())); + public static final RegistryObject ULTRA_HOE = TOOLS.register("ultra_hoe", () -> new HoeItem(ToolTiers.ULTRA, -4, 0.0f, new Item.Properties().fireResistant())); public static void register(IEventBus eventBus) {TOOLS.register(eventBus);} } diff --git a/src/main/resources/assets/compressedblocks/lang/en_us.json b/src/main/resources/assets/compressedblocks/lang/en_us.json index 04cfb15..1120695 100644 --- a/src/main/resources/assets/compressedblocks/lang/en_us.json +++ b/src/main/resources/assets/compressedblocks/lang/en_us.json @@ -16,5 +16,9 @@ "block.compressedblocks.granite_3x": "GraniteĀ³", "block.compressedblocks.granite_4x": "Graniteā“", "block.compressedblocks.cblock_mining": "Mining Block", - "item.compressedblocks.ultra_pickaxe": "Ultra Pickaxe" + "item.compressedblocks.ultra_sword": "Ultra Sword", + "item.compressedblocks.ultra_pickaxe": "Ultra Pickaxe", + "item.compressedblocks.ultra_axe": "Ultra Axe", + "item.compressedblocks.ultra_shovel": "Ultra Shovel", + "item.compressedblocks.ultra_hoe": "Ultra Hoe" } \ No newline at end of file diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_axe.png b/src/main/resources/assets/compressedblocks/textures/item/ultra_axe.png new file mode 100644 index 0000000..d377f54 Binary files /dev/null and b/src/main/resources/assets/compressedblocks/textures/item/ultra_axe.png differ diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_axe.png.mcmeta b/src/main/resources/assets/compressedblocks/textures/item/ultra_axe.png.mcmeta new file mode 100644 index 0000000..e18c5d3 --- /dev/null +++ b/src/main/resources/assets/compressedblocks/textures/item/ultra_axe.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 3, + "interpolate": true, + "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_hoe.png b/src/main/resources/assets/compressedblocks/textures/item/ultra_hoe.png new file mode 100644 index 0000000..911a18b Binary files /dev/null and b/src/main/resources/assets/compressedblocks/textures/item/ultra_hoe.png differ diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_hoe.png.mcmeta b/src/main/resources/assets/compressedblocks/textures/item/ultra_hoe.png.mcmeta new file mode 100644 index 0000000..e18c5d3 --- /dev/null +++ b/src/main/resources/assets/compressedblocks/textures/item/ultra_hoe.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 3, + "interpolate": true, + "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_pickaxe.png b/src/main/resources/assets/compressedblocks/textures/item/ultra_pickaxe.png index c499d09..aefbc3b 100644 Binary files a/src/main/resources/assets/compressedblocks/textures/item/ultra_pickaxe.png and b/src/main/resources/assets/compressedblocks/textures/item/ultra_pickaxe.png differ diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_shovel.png b/src/main/resources/assets/compressedblocks/textures/item/ultra_shovel.png new file mode 100644 index 0000000..200ab1e Binary files /dev/null and b/src/main/resources/assets/compressedblocks/textures/item/ultra_shovel.png differ diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_shovel.png.mcmeta b/src/main/resources/assets/compressedblocks/textures/item/ultra_shovel.png.mcmeta new file mode 100644 index 0000000..e18c5d3 --- /dev/null +++ b/src/main/resources/assets/compressedblocks/textures/item/ultra_shovel.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 3, + "interpolate": true, + "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_sword.png b/src/main/resources/assets/compressedblocks/textures/item/ultra_sword.png new file mode 100644 index 0000000..35b9837 Binary files /dev/null and b/src/main/resources/assets/compressedblocks/textures/item/ultra_sword.png differ diff --git a/src/main/resources/assets/compressedblocks/textures/item/ultra_sword.png.mcmeta b/src/main/resources/assets/compressedblocks/textures/item/ultra_sword.png.mcmeta new file mode 100644 index 0000000..e18c5d3 --- /dev/null +++ b/src/main/resources/assets/compressedblocks/textures/item/ultra_sword.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 3, + "interpolate": true, + "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] + } +} \ No newline at end of file diff --git a/src/main/textures/pickaxe.pxo b/src/main/textures/pickaxe.pxo deleted file mode 100644 index 39b8279..0000000 Binary files a/src/main/textures/pickaxe.pxo and /dev/null differ diff --git a/src/main/textures/ultra.pxo b/src/main/textures/ultra.pxo new file mode 100644 index 0000000..6ab85b0 Binary files /dev/null and b/src/main/textures/ultra.pxo differ