First cut of rework of Armory for 1.21.1

endercore/src/main/java/com/enderio/core/client/item/EnergyBarDecorator.java

@@ -10,7 +10,8 @@ public class EnergyBarDecorator implements IItemDecorator {
     public static final EnergyBarDecorator INSTANCE = new EnergyBarDecorator();
 
     // TODO: This color is difficult to see
-    public static final int BAR_COLOR = 0x00B168E4;
+    public static final int BAR_COLOR = 0xB168E4;
+    public static final int BAR_COLOR_ARGB = 0xFFB168E4;
 
     @Override
     public boolean render(GuiGraphics guiGraphics, Font font, ItemStack stack, int xOffset, int yOffset) {

enderio-armory/src/generated/resources/assets/enderio/lang/en_us.json

@@ -1,6 +1,7 @@
 {
   "info.enderio.darksteel.upgrade.activate": "Right Click to Activate",
   "info.enderio.darksteel.upgrade.available": "Available Upgrades",
+  "info.enderio.darksteel.upgrade.boots_snow": "Can walk on powdered snow",
   "info.enderio.darksteel.upgrade.cost": "Costs %s Levels",
   "info.enderio.darksteel.upgrade.direct": "Direct",
   "info.enderio.darksteel.upgrade.direct.description": "Teleports harvested items directly into your inventory",
@@ -21,10 +22,51 @@
   "info.enderio.darksteel.upgrade.explosive_penetration_l2": "Explosive Penetration II",
   "info.enderio.darksteel.upgrade.fork": "Fork",
   "info.enderio.darksteel.upgrade.fork.description": "Who needs a hoe when you have a fork?",
+  "info.enderio.darksteel.upgrade.invalid_upgrade": "Invalid upgrade for equipped item",
+  "info.enderio.darksteel.upgrade.jump.description_l1": "Enables double jump",
+  "info.enderio.darksteel.upgrade.jump.description_l2": "Enables triple jump",
+  "info.enderio.darksteel.upgrade.jump_l1": "Jump I",
+  "info.enderio.darksteel.upgrade.jump_l2": "Jump II",
+  "info.enderio.darksteel.upgrade.no_target": "No Dark Steel Item in Off-Hand",
   "info.enderio.darksteel.upgrade.no_xp": "Not enough XP",
+  "info.enderio.darksteel.upgrade.speed.description": "Increases movement speed",
+  "info.enderio.darksteel.upgrade.speed_l1": "Speed I",
+  "info.enderio.darksteel.upgrade.speed_l2": "Speed II",
+  "info.enderio.darksteel.upgrade.speed_l3": "Speed III",
   "info.enderio.darksteel.upgrade.spoon": "Spoon",
   "info.enderio.darksteel.upgrade.spoon.description": "Who needs a shovel when you have a spoon?",
+  "info.enderio.darksteel.upgrade.step_assist": "Step Assist",
+  "info.enderio.darksteel.upgrade.step_assist.description": "Step just a little higher",
+  "info.enderio.darksteel.upgrade.travel": "Travel",
+  "info.enderio.darksteel.upgrade.travel.description": "Integrated Travel Staff",
   "info.enderio.durability.amount": "Durability %s",
-  "info.enderio.headchance": "%s%% chance to drop a mob head",
-  "item.enderio.dark_steel_sword": "The Ender"
+  "info.enderio.ender.blockteleport": "Stops Enderman teleporting",
+  "info.enderio.ender.headchance": "%s%% chance to drop a mob head",
+  "info.enderio.ender.headinfo": "Cuts off mob heads once Empowered",
+  "item.enderio.dark_steel_axe": "Dark Axe",
+  "item.enderio.dark_steel_boots": "Dark Boots",
+  "item.enderio.dark_steel_chestplate": "Dark Chestplate",
+  "item.enderio.dark_steel_helmet": "Dark Helmet",
+  "item.enderio.dark_steel_leggings": "Dark Leggings",
+  "item.enderio.dark_steel_pickaxe": "Dark Pickaxe",
+  "item.enderio.dark_steel_sword": "The Ender",
+  "item.enderio.dark_steel_upgrade_blank": "Blank Upgrade",
+  "item.enderio.dark_steel_upgrade_direct": "Direct Upgrade",
+  "item.enderio.dark_steel_upgrade_empowered_1": "Empowered Upgrade",
+  "item.enderio.dark_steel_upgrade_empowered_2": "Empowered II Upgrade",
+  "item.enderio.dark_steel_upgrade_empowered_3": "Empowered III Upgrade",
+  "item.enderio.dark_steel_upgrade_empowered_4": "Empowered IV Upgrade",
+  "item.enderio.dark_steel_upgrade_fork": "Fork Upgrade",
+  "item.enderio.dark_steel_upgrade_jump_1": "Jump Upgrade",
+  "item.enderio.dark_steel_upgrade_jump_2": "Jump II Upgrade",
+  "item.enderio.dark_steel_upgrade_penetration_1": "EExplosive Penetration I Upgrade",
+  "item.enderio.dark_steel_upgrade_penetration_2": "EExplosive Penetration II Upgrade",
+  "item.enderio.dark_steel_upgrade_speedboost1": "Speed Upgrade",
+  "item.enderio.dark_steel_upgrade_speedboost2": "Speed II Upgrade",
+  "item.enderio.dark_steel_upgrade_speedboost3": "Speed III Upgrade",
+  "item.enderio.dark_steel_upgrade_spoon": "Spoon Upgrade",
+  "item.enderio.dark_steel_upgrade_step_assist": "Step Assist Upgrade",
+  "item.enderio.dark_steel_upgrade_tnt": "Explosive I Upgrade",
+  "item.enderio.dark_steel_upgrade_tnt2": "Explosive II Upgrade",
+  "item.enderio.dark_steel_upgrade_travel": "Travel Upgrade"
 }

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_axe.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_axe"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_boots.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_boots"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_chestplate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_chestplate"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_helmet.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_helmet"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_leggings.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_leggings"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_pickaxe.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_pickaxe"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_blank.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_blank"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_direct.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_direct"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_empowered_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_empowered_1"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_empowered_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_empowered_2"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_empowered_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_empowered_3"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_empowered_4.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_empowered_4"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_fork.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_fork"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_jump_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_jump_1"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_jump_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_jump_2"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_penetration_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_penetration_1"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_penetration_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_penetration_2"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_speedboost1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_speedboost1"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_speedboost2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_speedboost2"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_speedboost3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_speedboost3"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_spoon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_spoon"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_step_assist.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_step_assist"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_tnt.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_tnt"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_tnt2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_tnt2"
+  }
+}

enderio-armory/src/generated/resources/assets/enderio/models/item/dark_steel_upgrade_travel.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "enderio:item/dark_steel_upgrade_travel"
+  }
+}

enderio-armory/src/generated/resources/data/enderio/advancement/recipes/combat/dark_steel_boots.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": "enderio:dark_steel_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:dark_steel_boots"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ingredient"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:dark_steel_boots"
+    ]
+  }
+}

enderio-armory/src/generated/resources/data/enderio/advancement/recipes/combat/dark_steel_chestplate.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": "enderio:dark_steel_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:dark_steel_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ingredient"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:dark_steel_chestplate"
+    ]
+  }
+}

enderio-armory/src/generated/resources/data/enderio/advancement/recipes/combat/dark_steel_helmet.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": "enderio:dark_steel_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:dark_steel_helmet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ingredient"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:dark_steel_helmet"
+    ]
+  }
+}