added missing "Ultra" tools & rebalanced them

build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
 version = mod_version
@@ -30,7 +31,7 @@ minecraft {
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: mapping_channel, version: mapping_version
+    mappings channel: "parchment", version: "2023.09.03-1.20.1"
 
     // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
     // In most cases, it is not necessary to enable.

settings.gradle

@@ -5,6 +5,7 @@ pluginManagement {
             name = 'MinecraftForge'
             url = 'https://maven.minecraftforge.net/'
         }
+        maven { url = 'https://maven.parchmentmc.org' }
     }
 }
 

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()

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<Block> item) {

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()
     );

src/main/java/com/jenny/compressedblocks/moditems/Tools.java

@@ -11,9 +11,11 @@ public class Tools {
     public static final DeferredRegister<Item> TOOLS =
             DeferredRegister.create(ForgeRegistries.ITEMS, CompressedBlocks.MODID);
 
-    public static final RegistryObject<Item> ULTRA_PICKAXE = TOOLS.register("ultra_pickaxe", () -> new PickaxeItem(ToolTiers.ULTRA, 1,  -2.5f, new Item.Properties()));
-
-
+    public static final RegistryObject<Item> ULTRA_SWORD = TOOLS.register("ultra_sword", () -> new SwordItem(ToolTiers.ULTRA, 3,  -2.4f, new Item.Properties().fireResistant()));
+    public static final RegistryObject<Item> ULTRA_PICKAXE = TOOLS.register("ultra_pickaxe", () -> new PickaxeItem(ToolTiers.ULTRA, 1,  -2.8f, new Item.Properties().fireResistant()));
+    public static final RegistryObject<Item> ULTRA_AXE = TOOLS.register("ultra_axe", () -> new AxeItem(ToolTiers.ULTRA, 5.0f,  -2.5f, new Item.Properties().fireResistant()));
+    public static final RegistryObject<Item> ULTRA_SHOVEL = TOOLS.register("ultra_shovel", () -> new ShovelItem(ToolTiers.ULTRA, 1.5f,  -3.0f, new Item.Properties().fireResistant()));
+    public static final RegistryObject<Item> 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);}
 }

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"
 }

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]
+    }
+}

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]
+    }
+}

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]
+    }
+}

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]
+    }
+}

src/main/scripts/green_to_apha.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
-magick "$1" -transparent "#00ff00" "$1"
+for file in "$1"/*.png; do
+  echo "$file"
+  magick "$file" -transparent "#00ff00" "$file"
+done