Lots of fixes, lang fixes, recipe fixes, etc

port.MD

@@ -69,7 +69,7 @@
 - [ ] Feeder
 - [ ] Crusher and double crusher
 - [ ] Heat collectors
-- [ ] Precision dropper
+- [x] Precision dropper
 - [ ] Engineer's goggles
 - [ ] Laser relay modifiers and wrench
 - [ ] Handheld filler
@@ -77,7 +77,7 @@
 - [ ] Player probe
 - [ ] Item filter
 - [ ] Water bowl
-- [ ] Tiny coal and charcoal
+- [x] Tiny coal and charcoal
 - [ ] Rice slimeballs
 - [ ] Storage crate keeper
 - [ ] Color, detonation, certain death, killer and disenchanting lenses

src/generated/resources/.cache/cache

@@ -624,6 +624,7 @@ db1b6e924352a7e097a5675bbf2a27888c6cbded data/actuallyadditions/recipes/empoweri
 1b59c946f4cfbfc9bc3a2e7562105cd3a0d09d69 data/actuallyadditions/recipes/empowering/restonia_block.json
 74a9dc2b89805e5c232fa66da8db8e96af0b0703 data/actuallyadditions/recipes/empowering/void.json
 d112aa7267600c2a55f5efb617cb574aaa56502e data/actuallyadditions/recipes/empowering/void_block.json
+7306e280d2cb9ef47fe1cf43a2a289752a09a488 data/actuallyadditions/recipes/ender_casing.json
 3ade772cd50a533137dc1d27a2b060b85e525d8a data/actuallyadditions/recipes/engineers_goggles.json
 f2c63622c99c5ff552e5ce408956d3fe40582e43 data/actuallyadditions/recipes/engineers_goggles_advanced.json
 80df7dd9bc05ca5666c4945d632f9bfdb4cd6191 data/actuallyadditions/recipes/ethetic_green_slab.json
@@ -640,6 +641,7 @@ de7aabbafa4ce535079baed363c8828bc4efbff3 data/actuallyadditions/recipes/fermenti
 e86bd38ee24e97ed93d4b133af3850594e7b45de data/actuallyadditions/recipes/handheld_filler.json
 9b8ee8f545ef898e993b897d422fc54492854d34 data/actuallyadditions/recipes/hopping_item_interface.json
 a65757e5037582adc3b69b21b533af3f045c0eb8 data/actuallyadditions/recipes/iron_aiot.json
+8875472a4076802d8c5ed2b7bcc03d01b131ad5c data/actuallyadditions/recipes/iron_casing.json
 94353c0c347081fcd8060f5e6f5686556785cfd9 data/actuallyadditions/recipes/item_interface.json
 64c7d859937622662bb7e029c0e6f1d62d45d3be data/actuallyadditions/recipes/laser/crystalize_diamatine_crystal.json
 47add6ccc4dea960cd57fefc6081e6cd781225c2 data/actuallyadditions/recipes/laser/crystalize_diamatine_crystal_block.json
@@ -700,13 +702,14 @@ d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_su
 7cea1293846d740cd9470ee0e86e12004ce36bd4 data/actuallyadditions/recipes/solid_fuel/stick.json
 652b6e46c68cc83528e47b09a57bef3c91ccbb07 data/actuallyadditions/recipes/solid_fuel/tiny-coal.json
 8ebd738f3968564e22ba6841eb821e5064c78588 data/actuallyadditions/recipes/stone_aiot.json
-bc7a41d9f36cc43e146e0b727b6f439cc0d29343 data/actuallyadditions/recipes/teleport_staff.json
+430e4d51767c86fe7824e7d92b260bc430c753c4 data/actuallyadditions/recipes/teleport_staff.json
 bdf7dbf563485903e444400d341e56d0bf308481 data/actuallyadditions/recipes/tiny_torch.json
 b1761a179c6a6a45cc5a8246680d65c45651911d data/actuallyadditions/recipes/travelers_sack.json
 aac4c1515b4751f768da8b374aa3e0299ff8c760 data/actuallyadditions/recipes/triple_battery.json
 d8611ae9f616794678bb7f2d0c253383f09e8b27 data/actuallyadditions/recipes/vertical_digger.json
 171ba8265e3578776d8cba1dda8a72033eeb3de4 data/actuallyadditions/recipes/void_sack.json
 17503be947b6e654606f28e6d07d197eb91abc88 data/actuallyadditions/recipes/wings_of_the_bats.json
+c562b938e29b85572f1b30952f5711bca2c9c899 data/actuallyadditions/recipes/wood_casing.json
 5d0b3e0b27c0a7f82438fd24673866ce087d47f0 data/actuallyadditions/recipes/wooden_aiot.json
 a18f00e11fa55ff1b767eeab7a4756c2e0e93429 data/actuallyadditions/tags/items/coffee_beans.json
 2290b1829e049ab3002f3576379ad58f6d7b6ace data/actuallyadditions/tags/items/drills.json

src/generated/resources/data/actuallyadditions/recipes/ender_casing.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "WSW",
+    "SRS",
+    "WSW"
+  ],
+  "key": {
+    "W": {
+      "tag": "forge:ender_pearls"
+    },
+    "R": {
+      "item": "actuallyadditions:black_quartz_block"
+    },
+    "S": {
+      "item": "actuallyadditions:empowered_diamatine_crystal"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:ender_casing"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/iron_casing.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "WSW",
+    "SQS",
+    "WSW"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:black_quartz"
+    },
+    "W": {
+      "tag": "forge:ingots/iron"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:iron_casing"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json

@@ -10,7 +10,7 @@
       "item": "actuallyadditions:empowered_diamatine_crystal"
     },
     "E": {
-      "item": "actuallyadditions:ender_pearl_block"
+      "tag": "forge:ender_pearls"
     },
     "S": {
       "item": "actuallyadditions:ender_casing"

src/generated/resources/data/actuallyadditions/recipes/wood_casing.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "WSW",
+    "SRS",
+    "WSW"
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:rods/wooden"
+    },
+    "W": {
+      "tag": "minecraft:planks"
+    },
+    "R": {
+      "tag": "minecraft:logs"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:wood_casing"
+  }
+}

src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java

@@ -6,6 +6,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import net.minecraft.data.*;
 import net.minecraft.item.Items;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.util.IItemProvider;
 import net.minecraftforge.common.Tags;
 
@@ -177,6 +178,31 @@ public class BlockRecipeGenerator extends RecipeProvider {
         // Hopping Item Interface
         Recipe.shapeless(ActuallyBlocks.ITEM_INTERFACE_HOPPING.get()).ingredients(ActuallyBlocks.ITEM_INTERFACE.get()).save(consumer);
 
+        //Wood Casing
+        Recipe.shaped(ActuallyBlocks.WOOD_CASING.getItem())
+            .pattern("WSW", "SRS", "WSW")
+            .define('S', Tags.Items.RODS_WOODEN)
+            .define('W', ItemTags.PLANKS)
+            .define('R', ItemTags.LOGS)
+            .save(consumer);
+
+        //Iron Casing
+        Recipe.shaped(ActuallyBlocks.IRON_CASING.getItem())
+            .pattern("WSW", "SQS", "WSW")
+            .define('Q', ActuallyItems.BLACK_QUARTZ.get())
+            .define('W', Tags.Items.INGOTS_IRON)
+            .define('S', Tags.Items.RODS_WOODEN)
+            .save(consumer);
+
+        //Ender Casing
+        Recipe.shaped(ActuallyBlocks.ENDER_CASING.getItem())
+            .pattern("WSW", "SRS", "WSW")
+            .define('W', Tags.Items.ENDER_PEARLS)
+            .define('R', ActuallyBlocks.BLACK_QUARTZ.getItem())
+            .define('S', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get())
+            .save(consumer);
+
+
 
     }
 

src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java

@@ -229,7 +229,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
             .pattern(" S ")
             .pattern("SB ")
             .define('F', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get())
-            .define('E', ActuallyBlocks.ENDER_PEARL_BLOCK.getItem())
+            .define('E', Tags.Items.ENDER_PEARLS)
             .define('S', ActuallyBlocks.ENDER_CASING.getItem())
             .define('B', ActuallyItems.SINGLE_BATTERY.get()).save(consumer);
 

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java

@@ -13,75 +13,6 @@ package de.ellpeck.actuallyadditions.mod.crafting;
 // TODO: [port] MOVE TO DATA_GENERATOR
 @Deprecated
 public final class BlockCrafting {
-    //
-    //    public static final IRecipe[] RECIPES_LAMPS = new IRecipe[BlockColoredLamp.ALL_LAMP_TYPES.length];
-    //    public static IRecipe recipeSmileyCloud;
-    //    public static IRecipe recipePhantomface;
-    //    public static IRecipe recipeLiquiface;
-    //    public static IRecipe recipeEnergyface;
-    //    public static IRecipe recipePhantomBreaker;
-    //    public static IRecipe recipePhantomPlacer;
-    //    public static IRecipe recipeBreaker;
-    //    public static IRecipe recipePlacer;
-    //    public static IRecipe recipeLiquidPlacer;
-    //    public static IRecipe recipeLiquidCollector;
-    //    public static IRecipe recipeCase;
-    //    public static IRecipe recipeIronCase;
-    //    public static IRecipe recipeEnderCase;
-    //    public static IRecipe recipeEnderPearlBlock;
-    //    public static IRecipe recipeESD;
-    //    public static IRecipe recipeAdvancedESD;
-    //    public static IRecipe recipePhantomBooster;
-    //    public static IRecipe recipeCoffeeMachine;
-    //    public static IRecipe recipeCrusher;
-    //    public static IRecipe recipeDoubleCrusher;
-    //    public static IRecipe recipeFurnace;
-    //    public static IRecipe recipeSolidifier;
-    //    public static IRecipe recipeCasing;
-    //    public static IRecipe recipeGlass;
-    //    public static IRecipe recipeLavaFactory;
-    //    public static IRecipe recipeEnergizer;
-    //    public static IRecipe recipeEnervator;
-    //    public static IRecipe recipeSolar;
-    //    public static IRecipe recipeHeatCollector;
-    //    public static IRecipe recipeCoalGen;
-    //    public static IRecipe recipeOilGen;
-    //    public static IRecipe recipeRepairer;
-    //    public static IRecipe recipeFisher;
-    //    public static IRecipe recipeQuartzBlock;
-    //    public static IRecipe recipeQuartzChiseled;
-    //    public static IRecipe recipeQuartzPillar;
-    //    public static IRecipe recipeBlockChar;
-    //    public static IRecipe recipeFeeder;
-    //    public static IRecipe recipeCompost;
-    //    public static IRecipe recipeCrate;
-    //    public static IRecipe recipeCrateMedium;
-    //    public static IRecipe recipeCrateLarge;
-    //    public static IRecipe recipeFermentingBarrel;
-    //    public static IRecipe recipeCanolaPress;
-    //    public static IRecipe recipePowerer;
-    //    public static IRecipe recipeLeafGen;
-    //    public static IRecipe recipeDirectionalBreaker;
-    //    public static IRecipe recipeDropper;
-    //    public static IRecipe recipeRangedCollector;
-    //    public static IRecipe recipeLaserRelay;
-    //    public static IRecipe recipeLaserRelayAdvanced;
-    //    public static IRecipe recipeLaserRelayExtreme;
-    //    public static IRecipe recipeAtomicReconstructor;
-    //    public static IRecipe recipeMiner;
-    //    public static IRecipe recipeFireworkBox;
-    //    public static IRecipe recipePhantomRedstoneface;
-    //    public static IRecipe recipeLaserRelayItemWhitelist;
-    //    public static IRecipe recipeItemInterface;
-    //    public static IRecipe recipeItemInterfaceHopping;
-    //    public static IRecipe recipePlayerInterface;
-    //    public static IRecipe recipeDisplayStand;
-    //    public static IRecipe recipeShockSuppressor;
-    //    public static IRecipe recipeEmpowerer;
-    //    public static IRecipe[] recipesTinyTorch = new IRecipe[2];
-    //    public static IRecipe recipeBioReactor;
-    //    public static IRecipe recipeFarmer;
-    //    public static IRecipe recipeBatteryBox;
     //
     //    private static class FireworkIngredient extends Ingredient {
     //
@@ -211,22 +142,6 @@ public final class BlockCrafting {
     //        RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockXPSolidifier), "XXX", "DCD", "XXX", 'X', new ItemStack(InitItems.itemSolidifiedExperience), 'D', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()));
     //        recipeSolidifier = RecipeUtil.lastIRecipe();
     //
-    //        //Charcoal Block
-    //        RecipeHandler.addShapedRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()), "CCC", "CCC", "CCC", 'C', new ItemStack(Items.COAL, 1, 1));
-    //        recipeBlockChar = RecipeUtil.lastIRecipe();
-    //        RecipeHandler.addShapelessRecipe(new ItemStack(Items.COAL, 9, 1), new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()));
-    //
-    //        //Wood Casing
-    //        RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), "WSW", "SRS", "WSW", 'W', "plankWood", 'R', "logWood", 'S', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()) : "stickWood");
-    //        recipeCase = RecipeUtil.lastIRecipe();
-    //
-    //        //Iron Casing
-    //        RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), "WSW", "SQS", "WSW", 'Q', "gemQuartzBlack", 'W', "ingotIron", 'S', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()) : "stickWood");
-    //        recipeIronCase = RecipeUtil.lastIRecipe();
-    //
-    //        //Ender Casing
-    //        RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), "WSW", "SRS", "WSW", 'W', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()) : new ItemStack(Items.ENDER_PEARL), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), 'S', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(Blocks.DIAMOND_BLOCK) : new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()));
-    //        recipeEnderCase = RecipeUtil.lastIRecipe();
     //
     //        //Phantom Booster
     //        RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockPhantomBooster), "RDR", "DCD", "RDR", 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()));

src/main/resources/assets/actuallyadditions/lang/en_us.json

@@ -119,22 +119,22 @@
   "block.actuallyadditions.charcoal": "Block of Charcoal",
   "block.actuallyadditions.coal_generator": "Coal Generator",
   "block.actuallyadditions.lamp_powerer": "Lamp Controller",
-  "block.actuallyadditions.colored_lamp_white": "White Lamp",
+  "block.actuallyadditions.lamp_white": "White Lamp",
-  "block.actuallyadditions.colored_lamp_orange": "Orange Lamp",
+  "block.actuallyadditions.lamp_orange": "Orange Lamp",
-  "block.actuallyadditions.colored_lamp_magenta": "Magenta Lamp",
+  "block.actuallyadditions.lamp_magenta": "Magenta Lamp",
-  "block.actuallyadditions.colored_lamp_yellow": "Yellow Lamp",
+  "block.actuallyadditions.lamp_yellow": "Yellow Lamp",
-  "block.actuallyadditions.colored_lamp_light_blue": "Light Blue Lamp",
+  "block.actuallyadditions.lamp_light_blue": "Light Blue Lamp",
-  "block.actuallyadditions.colored_lamp_blue": "Blue Lamp",
+  "block.actuallyadditions.lamp_blue": "Blue Lamp",
-  "block.actuallyadditions.colored_lamp_gray": "Gray Lamp",
+  "block.actuallyadditions.lamp_gray": "Gray Lamp",
-  "block.actuallyadditions.colored_lamp_light_gray": "Light Gray Lamp",
+  "block.actuallyadditions.lamp_light_gray": "Light Gray Lamp",
-  "block.actuallyadditions.colored_lamp_green": "Green Lamp",
+  "block.actuallyadditions.lamp_green": "Green Lamp",
-  "block.actuallyadditions.colored_lamp_black": "Black Lamp",
+  "block.actuallyadditions.lamp_black": "Black Lamp",
-  "block.actuallyadditions.colored_lamp_brown": "Brown Lamp",
+  "block.actuallyadditions.lamp_brown": "Brown Lamp",
-  "block.actuallyadditions.colored_lamp_red": "Red Lamp",
+  "block.actuallyadditions.lamp_red": "Red Lamp",
-  "block.actuallyadditions.colored_lamp_lime": "Lime Lamp",
+  "block.actuallyadditions.lamp_lime": "Lime Lamp",
-  "block.actuallyadditions.colored_lamp_pink": "Pink Lamp",
+  "block.actuallyadditions.lamp_pink": "Pink Lamp",
-  "block.actuallyadditions.colored_lamp_cyan": "Cyan Lamp",
+  "block.actuallyadditions.lamp_cyan": "Cyan Lamp",
-  "block.actuallyadditions.colored_lamp_purple": "Purple Lamp",
+  "block.actuallyadditions.lamp_purple": "Purple Lamp",
   "block.actuallyadditions.phantomface": "Phantomface",
   "block.actuallyadditions.player_interface": "Player Interface",
   "block.actuallyadditions.phantom_energyface": "Phantom Energyface",
@@ -187,18 +187,18 @@
   "block.actuallyadditions.black_lotus": "Black Lotus",
   "block.actuallyadditions.testifi_bucks_white_fence": "Ethetic Quartz Wall",
   "block.actuallyadditions.testifi_bucks_green_fence": "Ethetic Green Wall",
-  "block.actuallyadditions.crystal_red": "Restonia Crystal Block",
+  "block.actuallyadditions.restonia_crystal_block": "Restonia Crystal Block",
-  "block.actuallyadditions.crystal_blue": "Palis Crystal Block",
+  "block.actuallyadditions.palis_crystal_block": "Palis Crystal Block",
-  "block.actuallyadditions.crystal_light_blue": "Diamatine Crystal Block",
+  "block.actuallyadditions.diamatine_crystal_block": "Diamatine Crystal Block",
-  "block.actuallyadditions.crystal_green": "Emeradic Crystal Block",
+  "block.actuallyadditions.emeradic_crystal_block": "Emeradic Crystal Block",
-  "block.actuallyadditions.crystal_black": "Void Crystal Block",
+  "block.actuallyadditions.void_crystal_block": "Void Crystal Block",
-  "block.actuallyadditions.crystal_white": "Enori Crystal Block",
+  "block.actuallyadditions.enori_crystal_block": "Enori Crystal Block",
-  "block.actuallyadditions.crystal_empowered_red": "Empowered Restonia Crystal Block",
+  "block.actuallyadditions.empowered_restonia_crystal_block": "Empowered Restonia Crystal Block",
-  "block.actuallyadditions.crystal_empowered_blue": "Empowered Palis Crystal Block",
+  "block.actuallyadditions.empowered_palis_crystal_block": "Empowered Palis Crystal Block",
-  "block.actuallyadditions.crystal_empowered_light_blue": "Empowered Diamatine Crystal Block",
+  "block.actuallyadditions.empowered_diamatine_crystal_block": "Empowered Diamatine Crystal Block",
-  "block.actuallyadditions.crystal_empowered_green": "Empowered Emeradic Crystal Block",
+  "block.actuallyadditions.empowered_emeradic_crystal_block": "Empowered Emeradic Crystal Block",
-  "block.actuallyadditions.crystal_empowered_black": "Empowered Void Crystal Block",
+  "block.actuallyadditions.empowered_void_crystal_block": "Empowered Void Crystal Block",
-  "block.actuallyadditions.crystal_empowered_white": "Empowered Enori Crystal Block",
+  "block.actuallyadditions.empowered_enori_crystal_block": "Empowered Enori Crystal Block",
   "block.actuallyadditions.miner": "Vertical Digger",
   "block.actuallyadditions.firework_box": "Firework Box",
   "block.actuallyadditions.quartz_wall": "Black Quartz Wall",
@@ -224,12 +224,12 @@
   "block.actuallyadditions.bio_reactor": "Bio Reactor",
   "block.actuallyadditions.farmer": "Farmer",
   "block.actuallyadditions.battery_box": "Battery Box",
-  "block.actuallyadditions.crystal_cluster_redstone": "Red Crystal Cluster",
+  "block.actuallyadditions.restonia_crystal_cluster": "Red Crystal Cluster",
-  "block.actuallyadditions.crystal_cluster_lapis": "Blue Crystal Cluster",
+  "block.actuallyadditions.palis_crystal_cluster": "Blue Crystal Cluster",
-  "block.actuallyadditions.crystal_cluster_diamond": "Light Blue Crystal Cluster",
+  "block.actuallyadditions.diamatine_crystal_cluster": "Light Blue Crystal Cluster",
-  "block.actuallyadditions.crystal_cluster_coal": "Black Crystal Cluster",
+  "block.actuallyadditions.void_crystal_cluster": "Black Crystal Cluster",
-  "block.actuallyadditions.crystal_cluster_emerald": "Green Crystal Cluster",
+  "block.actuallyadditions.emeradic_crystal_cluster": "Green Crystal Cluster",
-  "block.actuallyadditions.crystal_cluster_iron": "White Crystal Cluster",
+  "block.actuallyadditions.enori_crystal_cluster": "White Crystal Cluster",
   "_comment": "Reconstructor",
   "block.actuallyadditions.atomic_reconstructor": "Atomic Reconstructor",
   "block.actuallyadditions.atomic_reconstructor.info.1.1": "Molecular",
@@ -259,7 +259,22 @@
   "block.actuallyadditions.atomic_reconstructor.info.2.13": "Differentiator",
   "block.actuallyadditions.atomic_reconstructor.info.2.14": "Receiver",
   "_comment": "Items",
-  "item.actuallyadditions.drill": "Drill",
+  "item.actuallyadditions.drill_blue": "Blue Drill",
+  "item.actuallyadditions.drill_light_blue": "Light Blue Drill",
+  "item.actuallyadditions.drill_brown": "Brown Drill",
+  "item.actuallyadditions.drill_black": "Black Drill",
+  "item.actuallyadditions.drill_white": "White Drill",
+  "item.actuallyadditions.drill_magenta": "Magenta Drill",
+  "item.actuallyadditions.drill_orange": "Orange Drill",
+  "item.actuallyadditions.drill_pink": "Pink Drill",
+  "item.actuallyadditions.drill_purple": "Purple Drill",
+  "item.actuallyadditions.drill_red": "Red Drill",
+  "item.actuallyadditions.drill_yellow": "Yellow Drill",
+  "item.actuallyadditions.drill_cyan": "Cyan Drill",
+  "item.actuallyadditions.drill_gray": "Gray Drill",
+  "item.actuallyadditions.drill_green": "Green Drill",
+  "item.actuallyadditions.drill_light_gray": "Light Gray Drill",
+  "item.actuallyadditions.drill_lime": "Lime Drill",
   "item.actuallyadditions.rice": "Rice",
   "item.actuallyadditions.food_doughnut": "Doughnut",
   "item.actuallyadditions.rice_dough": "Rice Dough",
@@ -268,11 +283,11 @@
   "item.actuallyadditions.tiny_coal": "Tiny Coal",
   "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal",
   "item.actuallyadditions.rice_slime": "Rice Slimeball",
-  "item.actuallyadditions.battery": "Single Battery",
+  "item.actuallyadditions.single_battery": "Single Battery",
-  "item.actuallyadditions.battery_double": "Double Battery",
+  "item.actuallyadditions.double_battery": "Double Battery",
-  "item.actuallyadditions.battery_triple": "Triple Battery",
+  "item.actuallyadditions.triple_battery": "Triple Battery",
-  "item.actuallyadditions.battery_quadruple": "Quadruple Battery",
+  "item.actuallyadditions.quadruple_battery": "Quadruple Battery",
-  "item.actuallyadditions.battery_quintuple": "Quintuple Battery",
+  "item.actuallyadditions.quintuple_battery": "Quintuple Battery",
   "item.actuallyadditions.growth_ring": "Ring of Growth",
   "item.actuallyadditions.water_removal_ring": "Ring of Liquid Banning",
   "item.actuallyadditions.suction_ring": "Ring of Magnetizing",
@@ -282,17 +297,15 @@
   "item.actuallyadditions.empowered_oil_bucket": "Empowered Oil Bucket",
   "item.actuallyadditions.wings_of_the_bats": "Wings Of The Bats",
   "item.actuallyadditions.bat_wing": "Bat's Wing",
-  "item.actuallyadditions.wooden_paxel": "Wooden AIOT",
+  "item.actuallyadditions.wooden_aiot": "Wooden AIOT",
-  "item.actuallyadditions.stone_paxel": "Stone AIOT",
+  "item.actuallyadditions.stone_aiot": "Stone AIOT",
-  "item.actuallyadditions.iron_paxel": "Iron AIOT",
+  "item.actuallyadditions.iron_aiot": "Iron AIOT",
-  "item.actuallyadditions.gold_paxel": "Golden AIOT",
+  "item.actuallyadditions.gold_aiot": "Golden AIOT",
-  "item.actuallyadditions.diamond_paxel": "Diamond AIOT",
+  "item.actuallyadditions.diamond_aiot": "Diamond AIOT",
-  "item.actuallyadditions.emerald_paxel": "Emerald AIOT",
+  "item.actuallyadditions.netherite_aiot": "Netherite AIOT",
-  "item.actuallyadditions.obsidian_paxel": "Obsidian AIOT",
-  "item.actuallyadditions.quartz_paxel": "Black Quartz AIOT",
   "item.actuallyadditions.phantom_connector": "Phantom Connector",
-  "item.actuallyadditions.cup": "Empty Cup",
+  "item.actuallyadditions.empty_cup": "Empty Cup",
-  "item.actuallyadditions.coffee": "Cup with Coffee",
+  "item.actuallyadditions.coffee_cup": "Cup with Coffee",
   "item.actuallyadditions.coffee_seeds": "Coffee Seeds",
   "item.actuallyadditions.coffee_beans": "Coffee Beans",
   "item.actuallyadditions.canola_seeds": "Canola Seeds",
@@ -316,33 +329,11 @@
   "item.actuallyadditions.black_quartz": "Black Quartz",
   "item.actuallyadditions.ring": "Ring",
   "item.actuallyadditions.ring.storage": "Blaze Stored",
-  "item.actuallyadditions.tele_staff": "Teleport Staff",
+  "item.actuallyadditions.teleport_staff": "Teleport Staff",
-  "item.actuallyadditions.jam_cu_ba_ra": "CuBaRa-Jam",
-  "item.actuallyadditions.jam_gra_ki_ba": "GraKiBa-Jam",
-  "item.actuallyadditions.jam_pl_ap_le": "PlApLe-Jam",
-  "item.actuallyadditions.jam_ch_ap_ci": "ChApCi-Jam",
-  "item.actuallyadditions.jam_ho_me_ki": "HoMeKi-Jam",
-  "item.actuallyadditions.jam_ho_me_co": "HoMeCo-Jam",
-  "item.actuallyadditions.jam_pi_co": "PiCo-Jam",
   "item.actuallyadditions.hairy_ball": "Ball of Fur",
   "item.actuallyadditions.leaf_blower": "Leaf Blower",
-  "item.actuallyadditions.leaf_blower_advanced": "Advanced Leaf Blower",
+  "item.actuallyadditions.advanced_leaf_blower": "Advanced Leaf Blower",
   "item.actuallyadditions.knife": "Knife",
-  "item.actuallyadditions.pickaxe_emerald": "Emerald Pickaxe",
-  "item.actuallyadditions.axe_emerald": "Emerald Axe",
-  "item.actuallyadditions.shovel_emerald": "Emerald Shovel",
-  "item.actuallyadditions.hoe_emerald": "Emerald Hoe",
-  "item.actuallyadditions.sword_emerald": "Emerald Sword",
-  "item.actuallyadditions.pickaxe_quartz": "Black Quartz Pickaxe",
-  "item.actuallyadditions.axe_quartz": "Black Quartz Axe",
-  "item.actuallyadditions.shovel_quartz": "Black Quartz Shovel",
-  "item.actuallyadditions.hoe_quartz": "Black Quartz Hoe",
-  "item.actuallyadditions.sword_quartz": "Black Quartz Sword",
-  "item.actuallyadditions.pickaxe_obsidian": "Obsidian Pickaxe",
-  "item.actuallyadditions.axe_obsidian": "Obsidian Axe",
-  "item.actuallyadditions.shovel_obsidian": "Obsidian Shovel",
-  "item.actuallyadditions.hoe_obsidian": "Obsidian Hoe",
-  "item.actuallyadditions.sword_obsidian": "Obsidian Sword",
   "item.actuallyadditions.crafter_on_a_stick": "Crafting Table On A Stick",
   "item.actuallyadditions.food_baguette": "Baguette",
   "item.actuallyadditions.food_pizza": "Pizza",
@@ -375,18 +366,6 @@
   "item.actuallyadditions.dust_coal": "Crushed Coal",
   "item.actuallyadditions.dust_quartz_black": "Crushed Black Quartz",
   "item.actuallyadditions.flax_seeds": "Flax Seeds",
-  "item.actuallyadditions.helm_obsidian": "Obsidian Helmet",
-  "item.actuallyadditions.chest_obsidian": "Obsidian Chestplate",
-  "item.actuallyadditions.pants_obsidian": "Obsidian Pants",
-  "item.actuallyadditions.boots_obsidian": "Obsidian Boots",
-  "item.actuallyadditions.helm_emerald": "Emerald Helmet",
-  "item.actuallyadditions.chest_emerald": "Emerald Chestplate",
-  "item.actuallyadditions.pants_emerald": "Emerald Pants",
-  "item.actuallyadditions.boots_emerald": "Emerald Boots",
-  "item.actuallyadditions.helm_quartz": "Black Quartz Helmet",
-  "item.actuallyadditions.chest_quartz": "Black Quartz Chestplate",
-  "item.actuallyadditions.pants_quartz": "Black Quartz Pants",
-  "item.actuallyadditions.boots_quartz": "Black Quartz Boots",
   "item.actuallyadditions.booklet": "Actually Additions Manual",
   "item.actuallyadditions.rarmor_module_reconstructor": "Reconstruction Module",
   "item.actuallyadditions.laser_wrench": "Laser Wrench",
@@ -395,18 +374,18 @@
   "item.actuallyadditions.medium_to_large_crate_upgrade": "Medium To Large Storage Crate Upgrade",
   "item.actuallyadditions.drill_core": "Drill Core",
   "item.actuallyadditions.black_dye": "Black Dye",
-  "item.actuallyadditions.crystal_red": "Restonia Crystal",
+  "item.actuallyadditions.restonia_crystal": "Restonia Crystal",
-  "item.actuallyadditions.crystal_blue": "Palis Crystal",
+  "item.actuallyadditions.palis_crystal": "Palis Crystal",
-  "item.actuallyadditions.crystal_light_blue": "Diamatine Crystal",
+  "item.actuallyadditions.diamatine_crystal": "Diamatine Crystal",
-  "item.actuallyadditions.crystal_green": "Emeradic Crystal",
+  "item.actuallyadditions.emeradic_crystal": "Emeradic Crystal",
-  "item.actuallyadditions.crystal_black": "Void Crystal",
+  "item.actuallyadditions.void_crystal": "Void Crystal",
-  "item.actuallyadditions.crystal_white": "Enori Crystal",
+  "item.actuallyadditions.enori_crystal": "Enori Crystal",
-  "item.actuallyadditions.crystal_empowered_red": "Empowered Restonia Crystal",
+  "item.actuallyadditions.empowered_restonia_crystal": "Empowered Restonia Crystal",
-  "item.actuallyadditions.crystal_empowered_blue": "Empowered Palis Crystal",
+  "item.actuallyadditions.empowered_palis_crystal": "Empowered Palis Crystal",
-  "item.actuallyadditions.crystal_empowered_light_blue": "Empowered Diamatine Crystal",
+  "item.actuallyadditions.empowered_diamatine_crystal": "Empowered Diamatine Crystal",
-  "item.actuallyadditions.crystal_empowered_green": "Empowered Emeradic Crystal",
+  "item.actuallyadditions.empowered_emeradic_crystal": "Empowered Emeradic Crystal",
-  "item.actuallyadditions.crystal_empowered_black": "Empowered Void Crystal",
+  "item.actuallyadditions.empowered_void_crystal": "Empowered Void Crystal",
-  "item.actuallyadditions.crystal_empowered_white": "Empowered Enori Crystal",
+  "item.actuallyadditions.empowered_enori_crystal": "Empowered Enori Crystal",
   "item.actuallyadditions.lens": "Lens",
   "item.actuallyadditions.color_lens": "Lens of Color",
   "item.actuallyadditions.explosion_lens": "Lens of Detonation",
@@ -496,12 +475,12 @@
   "item.actuallyadditions.engineer_goggles": "Engineer's Goggles",
   "item.actuallyadditions.engineer_goggles_advanced": "Engineer's Infrared Goggles",
   "item.actuallyadditions.laser_upgrade_range": "Laser Relay Modifier: Range",
-  "item.actuallyadditions.crystal_shard_red": "Red Crystal Shard",
+  "item.actuallyadditions.restonia_crystal_shard": "Red Crystal Shard",
-  "item.actuallyadditions.crystal_shard_blue": "Blue Crystal Shard",
+  "item.actuallyadditions.palis_crystal_shard": "Blue Crystal Shard",
-  "item.actuallyadditions.crystal_shard_light_blue": "Light Blue Crystal Shard",
+  "item.actuallyadditions.diamatine_crystal_shard": "Light Blue Crystal Shard",
-  "item.actuallyadditions.crystal_shard_black": "Black Crystal Shard",
+  "item.actuallyadditions.void_crystal_shard": "Black Crystal Shard",
-  "item.actuallyadditions.crystal_shard_green": "Green Crystal Shard",
+  "item.actuallyadditions.emeradic_crystal_shard": "Green Crystal Shard",
-  "item.actuallyadditions.crystal_shard_white": "White Crystal Shard",
+  "item.actuallyadditions.enori_crystal_shard": "White Crystal Shard",
   "_comment": "Tooltips",
   "tooltip.actuallyadditions.onSuffix.desc": "On",
   "tooltip.actuallyadditions.phantom.connected.desc": "<Block connected!>",