diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 9201d48d1..c2f717e2e 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -724,9 +724,21 @@ e088aee52db067c15c72bfe743ac106b98ca4be2 data/actuallyadditions/recipes/colorcha 11ddd815c96912369ee0d96fe719d5958370ed3c data/actuallyadditions/recipes/colorchange/yellow_stained_glass_pane.json a4fb51f83c38bfebceeadde885d59632e355bf6d data/actuallyadditions/recipes/colorchange/yellow_terracotta.json ca4f8d37d115eac5889542b04d1c01cd2e0cde43 data/actuallyadditions/recipes/colorchange/yellow_wool.json +2ea3fb111f855689ddf7a1422cad766f0ead708e data/actuallyadditions/recipes/compress/diamatine_crystal.json +0b88bc4b719117301ffcfd3655e7c39237fbc738 data/actuallyadditions/recipes/compress/emeradic_crystal.json +ad61df964db9f0888e4c62d6f2ed0b5d6dfc0bb7 data/actuallyadditions/recipes/compress/enori_crystal.json +e6a63e36ebe2a2eda42a47f74361d1eb0998270b data/actuallyadditions/recipes/compress/palis_crystal.json +06d403ccf527c0f8f344400e5cfb74ea46c0f60b data/actuallyadditions/recipes/compress/restonia_crystal.json +e692a96119d3011f3040c8faef64983805f1845c data/actuallyadditions/recipes/compress/void_crystal.json 6a7cf2e5eb1fd134328a182b8001fdf0e622c94a data/actuallyadditions/recipes/crafter_on_a_stick.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json 341c5816febc417a36e516986f6d1461cf38cfed data/actuallyadditions/recipes/crushing/bone_crusher.json +b686724fcedd5b0a4b18beecaa3e29efede221f6 data/actuallyadditions/recipes/decompress/diamatine_crystal_shard.json +110700fd24781a52ad42e21fb0f05f8a705de86f data/actuallyadditions/recipes/decompress/emeradic_crystal_shard.json +542ba53d09109c9dcbf7094634826c102dd09545 data/actuallyadditions/recipes/decompress/enori_crystal_shard.json +42dd68ff6218de4c11d7e41a361fde2a66d52f05 data/actuallyadditions/recipes/decompress/palis_crystal_shard.json +283db5fa2689b120f4a9050dca40e1f62df7a3ec data/actuallyadditions/recipes/decompress/restonia_crystal_shard.json +79bf1e6f79307cb1754d0deff57a9c8f8b82e0ad data/actuallyadditions/recipes/decompress/void_crystal_shard.json 293cecfa94d22e62bd817a3964e82dca4479d44d data/actuallyadditions/recipes/diamond_aiot.json abb220fb19dea7cf9afcd30fbe533d21b7c4e9c0 data/actuallyadditions/recipes/display_stand.json f3465f5a05a931f4e5933508c2bc56de9c9eafe5 data/actuallyadditions/recipes/double_battery.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/compress/diamatine_crystal.json b/src/generated/resources/data/actuallyadditions/recipes/compress/diamatine_crystal.json new file mode 100644 index 000000000..f559dc7e6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/compress/diamatine_crystal.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "actuallyadditions:diamatine_crystal_shard" + } + }, + "result": { + "item": "actuallyadditions:diamatine_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/compress/emeradic_crystal.json b/src/generated/resources/data/actuallyadditions/recipes/compress/emeradic_crystal.json new file mode 100644 index 000000000..08a906ea7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/compress/emeradic_crystal.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "actuallyadditions:emeradic_crystal_shard" + } + }, + "result": { + "item": "actuallyadditions:emeradic_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/compress/enori_crystal.json b/src/generated/resources/data/actuallyadditions/recipes/compress/enori_crystal.json new file mode 100644 index 000000000..fdc9dfadc --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/compress/enori_crystal.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "actuallyadditions:enori_crystal_shard" + } + }, + "result": { + "item": "actuallyadditions:enori_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/compress/palis_crystal.json b/src/generated/resources/data/actuallyadditions/recipes/compress/palis_crystal.json new file mode 100644 index 000000000..3bd3f5652 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/compress/palis_crystal.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "actuallyadditions:palis_crystal_shard" + } + }, + "result": { + "item": "actuallyadditions:palis_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/compress/restonia_crystal.json b/src/generated/resources/data/actuallyadditions/recipes/compress/restonia_crystal.json new file mode 100644 index 000000000..dd3754cf1 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/compress/restonia_crystal.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "actuallyadditions:restonia_crystal_shard" + } + }, + "result": { + "item": "actuallyadditions:restonia_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/compress/void_crystal.json b/src/generated/resources/data/actuallyadditions/recipes/compress/void_crystal.json new file mode 100644 index 000000000..5f6f21f94 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/compress/void_crystal.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "actuallyadditions:void_crystal_shard" + } + }, + "result": { + "item": "actuallyadditions:void_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/decompress/diamatine_crystal_shard.json b/src/generated/resources/data/actuallyadditions/recipes/decompress/diamatine_crystal_shard.json new file mode 100644 index 000000000..0a41010a9 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/decompress/diamatine_crystal_shard.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:diamatine_crystal" + } + ], + "result": { + "item": "actuallyadditions:diamatine_crystal_shard", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/decompress/emeradic_crystal_shard.json b/src/generated/resources/data/actuallyadditions/recipes/decompress/emeradic_crystal_shard.json new file mode 100644 index 000000000..184ac7096 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/decompress/emeradic_crystal_shard.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:emeradic_crystal" + } + ], + "result": { + "item": "actuallyadditions:emeradic_crystal_shard", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/decompress/enori_crystal_shard.json b/src/generated/resources/data/actuallyadditions/recipes/decompress/enori_crystal_shard.json new file mode 100644 index 000000000..e55eec96d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/decompress/enori_crystal_shard.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:enori_crystal" + } + ], + "result": { + "item": "actuallyadditions:enori_crystal_shard", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/decompress/palis_crystal_shard.json b/src/generated/resources/data/actuallyadditions/recipes/decompress/palis_crystal_shard.json new file mode 100644 index 000000000..cfdb06eee --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/decompress/palis_crystal_shard.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:palis_crystal" + } + ], + "result": { + "item": "actuallyadditions:palis_crystal_shard", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/decompress/restonia_crystal_shard.json b/src/generated/resources/data/actuallyadditions/recipes/decompress/restonia_crystal_shard.json new file mode 100644 index 000000000..6171eb221 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/decompress/restonia_crystal_shard.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:restonia_crystal" + } + ], + "result": { + "item": "actuallyadditions:restonia_crystal_shard", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/decompress/void_crystal_shard.json b/src/generated/resources/data/actuallyadditions/recipes/decompress/void_crystal_shard.json new file mode 100644 index 000000000..a4ed525fc --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/decompress/void_crystal_shard.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:void_crystal" + } + ], + "result": { + "item": "actuallyadditions:void_crystal_shard", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index c8376991e..a2ac7a125 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -20,7 +20,9 @@ import net.minecraftforge.common.Tags; import net.minecraftforge.common.crafting.ConditionalRecipe; import net.minecraftforge.common.crafting.NBTIngredient; import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.ForgeRegistries; +import javax.annotation.Nonnull; import java.nio.file.Path; import java.util.Arrays; import java.util.function.Consumer; @@ -479,6 +481,15 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('I', Items.IRON_HELMET) .save(consumer); + //Shards + addShard(consumer, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL); + addShard(consumer, ActuallyItems.ENORI_CRYSTAL_SHARD, ActuallyItems.ENORI_CRYSTAL); + addShard(consumer, ActuallyItems.RESTONIA_CRYSTAL_SHARD, ActuallyItems.RESTONIA_CRYSTAL); + addShard(consumer, ActuallyItems.PALIS_CRYSTAL_SHARD, ActuallyItems.PALIS_CRYSTAL); + addShard(consumer, ActuallyItems.DIAMATINE_CRYSTAL_SHARD, ActuallyItems.DIAMATINE_CRYSTAL); + addShard(consumer, ActuallyItems.EMERADIC_CRYSTAL_SHARD, ActuallyItems.EMERADIC_CRYSTAL); + + // //Quartz // GameRegistry.addSmelting(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), 1F); @@ -522,6 +533,19 @@ public class ItemRecipeGenerator extends RecipeProvider { .save(consumer); } + public static void decompress(Consumer consumer, RegistryObject output, RegistryObject input) { + ResourceLocation key = ForgeRegistries.ITEMS.getKey(output.get()); + Recipe.shapeless(output.get(), 9).requires(input.get()).save(consumer, new ResourceLocation(key.getNamespace(), "decompress/" + key.getPath())); + } + public static void compress(Consumer consumer, RegistryObject output, RegistryObject input) { + ResourceLocation key = ForgeRegistries.ITEMS.getKey(output.get()); + Recipe.shaped(output.get()).pattern("xxx","xxx", "xxx").define('x', input.get()).save(consumer, new ResourceLocation(key.getNamespace(), "compress/" + key.getPath())); + } + public static void addShard(Consumer consumer, RegistryObject shard, RegistryObject crystal) { + compress(consumer, crystal, shard); + decompress(consumer, shard, crystal); + } + @Override protected void saveAdvancement(DirectoryCache cache, JsonObject cache2, Path advancementJson) { @@ -627,7 +651,7 @@ public class ItemRecipeGenerator extends RecipeProvider { } @Override - public void save(Consumer consumer) { + public void save(@Nonnull Consumer consumer) { this.unlockedBy("has_book", has(ActuallyItems.ITEM_BOOKLET.get())); if (this.name != null) { this.save(consumer, this.name); @@ -635,6 +659,11 @@ public class ItemRecipeGenerator extends RecipeProvider { super.save(consumer); } } + @Override + public void save(@Nonnull Consumer consumer, @Nonnull ResourceLocation location) { + this.unlockedBy("", has(Items.AIR)); + super.save(consumer, location); + } } private static class Shaped extends ShapedRecipeBuilder { @@ -674,10 +703,16 @@ public class ItemRecipeGenerator extends RecipeProvider { } @Override - public void save(Consumer consumerIn) { + public void save(@Nonnull Consumer consumerIn) { this.unlockedBy("has_book", has(ActuallyItems.ITEM_BOOKLET.get())); super.save(consumerIn); } + + @Override + public void save(@Nonnull Consumer consumer, @Nonnull ResourceLocation location) { + this.unlockedBy("", has(Items.AIR)); + super.save(consumer, location); + } } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index 09b30996d..6e0eb5229 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -148,7 +148,6 @@ public final class ActuallyItems { public static final RegistryObject DRILL_UPGRADE_THREE_BY_THREE = ITEMS.register("drill_upgrade_three_by_three", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)); public static final RegistryObject DRILL_UPGRADE_FIVE_BY_FIVE = ITEMS.register("drill_upgrade_five_by_five", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)); public static final RegistryObject DRILL_UPGRADE_BLOCK_PLACING = ITEMS.register("drill_upgrade_block_placing", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER)); - public static final RegistryObject COFFEE = ITEMS.register("coffee", ItemCoffee::new); //TODO flatten public static final RegistryObject PHANTOM_CONNECTOR = ITEMS.register("phantom_connector", ItemPhantomConnector::new); //public static final RegistryObject FOOD = ITEMS.register("food", ItemBase::new); //just... food? //TODO public static final RegistryObject CRAFTER_ON_A_STICK = ITEMS.register("crafter_on_a_stick", ItemCrafterOnAStick::new); @@ -158,7 +157,6 @@ public final class ActuallyItems { public static final RegistryObject ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", () -> new ItemLeafBlower(true)); public static final RegistryObject COFFEE_BEANS = ITEMS.register("coffee_beans", ItemCoffeeBean::new); - public static final RegistryObject FLAX = ITEMS.register("flax", ItemBase::new); public static final RegistryObject RICE_SEEDS = ITEMS.register("rice_seeds", () -> new AABlockItem.AASeedItem(ActuallyBlocks.RICE.get(), ActuallyItems.defaultProps())); //() -> new ItemSeed("seedRice", ActuallyBlocks.RICE.get(), FOOD.get(), TheFoods.RICE.ordinal())); public static final RegistryObject CANOLA_SEEDS = ITEMS.register("canola_seeds", () -> new AABlockItem.AASeedItem(ActuallyBlocks.CANOLA.get(), ActuallyItems.defaultProps())); //() -> new ItemFoodSeed("seedCanola", ActuallyBlocks.CANOLA, itemMisc, 0, 1, 0.01F, 10).setPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 0), 0.2F)); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 20bc9dd42..7cdedfa5f 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -95,9 +95,9 @@ "death.actuallyadditions.atomicreconstructor.4": "%s shouldn't have ate that Reconstructor!", "death.actuallyadditions.atomicreconstructor.5": "%s should have used some re-construction foam.", "_comment": "Blocks", - "block.actuallyadditions.ore_black_quartz": "Black Quartz Ore (wip)", + "block.actuallyadditions.black_quartz_ore": "Black Quartz Ore (wip)", "block.actuallyadditions.black_quartz_block": "Block of Black Quartz", - "block.actuallyadditions.black_quartz_chiseled_block": "Chiseled Block of Black Quartz", + "block.actuallyadditions.chiseled_black_quartz_block": "Chiseled Black Quartz", "block.actuallyadditions.black_quartz_pillar_block": "Pillar of Black Quartz", "block.actuallyadditions.smooth_black_quartz_block": "Smooth Black Quartz", "block.actuallyadditions.black_quartz_brick_block": "Black Quartz Bricks", @@ -131,7 +131,7 @@ "block.actuallyadditions.lamp_pink": "Pink Lamp", "block.actuallyadditions.lamp_cyan": "Cyan Lamp", "block.actuallyadditions.lamp_purple": "Purple Lamp", - "block.actuallyadditions.phantomface": "Phantomface (wip)", + "block.actuallyadditions.phantom_itemface": "Phantom Itemface (wip)", "block.actuallyadditions.player_interface": "Player Interface (wip)", "block.actuallyadditions.phantom_energyface": "Phantom Energyface (wip)", "block.actuallyadditions.phantom_redstoneface": "Phantom Redstoneface (wip)", @@ -139,13 +139,13 @@ "block.actuallyadditions.phantom_placer": "Phantom Placer (wip)", "block.actuallyadditions.phantom_breaker": "Phantom Breaker (wip)", "block.actuallyadditions.lava_factory_controller": "Lava Factory Controller (wip)", - "block.actuallyadditions.lava_factory_case": "Casing (wip)", + "block.actuallyadditions.lava_factory_casing": "Lava Casing (wip)", "block.actuallyadditions.fluid_placer": "Fluid Placer", "block.actuallyadditions.fluid_collector": "Fluid Collector", "block.actuallyadditions.phantom_booster": "Phantom Booster (wip)", "block.actuallyadditions.coffee": "Coffee Plant", - "block.actuallyadditions.ethetic_green_wall": "Ethetic Green Quartz Block", - "block.actuallyadditions.ethetic_white_wall": "Ethetic Quartz", + "block.actuallyadditions.ethetic_green_block": "Ethetic Green Quartz", + "block.actuallyadditions.ethetic_white_block": "Ethetic Quartz", "block.actuallyadditions.ethetic_green_stairs": "Ethetic Green Quartz Stairs", "block.actuallyadditions.ethetic_white_stairs": "Ethetic Quartz Stairs", "block.actuallyadditions.ethetic_green_slab": "Ethetic Green Quartz Slab", @@ -167,7 +167,7 @@ "block.actuallyadditions.coffee_machine": "Coffee Maker (wip)", "block.actuallyadditions.xp_solidifier": "Experience Solidifier (wip)", "block.actuallyadditions.leaf_generator": "Leaf-Eating Generator (wip)", - "block.actuallyadditions.directional_breaker": "Long-Range Breaker (wip)", + "block.actuallyadditions.long_range_breaker": "Long-Range Breaker (wip)", "block.actuallyadditions.ranged_collector": "Ranged Collector (wip)", "block.actuallyadditions.laser_relay": "Energy Laser Relay (wip)", "block.actuallyadditions.laser_relay_advanced": "Advanced Energy Laser Relay (wip)", @@ -175,8 +175,8 @@ "block.actuallyadditions.laser_relay_fluids": "Fluid Laser Relay (wip)", "block.actuallyadditions.iron_casing": "Iron Casing", "block.actuallyadditions.black_lotus": "Black Lotus", - "block.actuallyadditions.ethetic_white_fence": "Ethetic Quartz Wall", - "block.actuallyadditions.ethetic_green_fence": "Ethetic Green Wall", + "block.actuallyadditions.ethetic_white_wall": "Ethetic Quartz Wall", + "block.actuallyadditions.ethetic_green_wall": "Ethetic Green Quartz Wall", "block.actuallyadditions.restonia_crystal_block": "Restonia Crystal Block", "block.actuallyadditions.palis_crystal_block": "Palis Crystal Block", "block.actuallyadditions.diamatine_crystal_block": "Diamatine Crystal Block", @@ -191,25 +191,25 @@ "block.actuallyadditions.empowered_enori_crystal_block": "Empowered Enori Crystal Block", "block.actuallyadditions.miner": "Vertical Digger (wip)", "block.actuallyadditions.firework_box": "Firework Box (wip)", - "block.actuallyadditions.quartz_wall": "Black Quartz Wall", - "block.actuallyadditions.quartz_stair": "Black Quartz Stairs", - "block.actuallyadditions.quartz_slab": "Black Quartz Slab", - "block.actuallyadditions.chiseled_quartz_wall": "Chiseled Black Quartz Wall", - "block.actuallyadditions.chiseled_quartz_stair": "Chiseled Black Quartz Stairs", - "block.actuallyadditions.chiseled_quartz_slab": "Chiseled Black Quartz Slab", + "block.actuallyadditions.black_quartz_wall": "Black Quartz Wall", + "block.actuallyadditions.black_quartz_stair": "Black Quartz Stairs", + "block.actuallyadditions.black_quartz_slab": "Black Quartz Slab", + "block.actuallyadditions.chiseled_black_quartz_wall": "Chiseled Black Quartz Wall", + "block.actuallyadditions.chiseled_black_quartz_stair": "Chiseled Black Quartz Stairs", + "block.actuallyadditions.chiseled_black_quartz_slab": "Chiseled Black Quartz Slab", "block.actuallyadditions.smooth_black_quartz_wall": "Smooth Black Quartz Wall", "block.actuallyadditions.smooth_black_quartz_stair": "Smooth Black Quartz Stairs", "block.actuallyadditions.smooth_black_quartz_slab": "Smooth Black Quartz Slab", "block.actuallyadditions.black_quartz_brick_wall": "Black Quartz Brick Wall", "block.actuallyadditions.black_quartz_brick_stair": "Black Quartz Brick Stairs", "block.actuallyadditions.black_quartz_brick_slab": "Black Quartz Brick Slab", - "block.actuallyadditions.pillar_quartz_wall": "Black Quartz Pillar Wall", - "block.actuallyadditions.pillar_quartz_stair": "Black Quartz Pillar Stairs", - "block.actuallyadditions.pillar_quartz_slab": "Black Quartz Pillar Slab", + "block.actuallyadditions.black_quartz_pillar_wall": "Black Quartz Pillar Wall", + "block.actuallyadditions.black_quartz_pillar_stair": "Black Quartz Pillar Stairs", + "block.actuallyadditions.black_quartz_pillar_slab": "Black Quartz Pillar Slab", "block.actuallyadditions.laser_relay_item": "Item Laser Relay (wip)", - "block.actuallyadditions.laser_relay_item_whitelist": "Advanced Item Laser Relay (wip)", - "block.actuallyadditions.item_viewer": "Item Interface (wip)", - "block.actuallyadditions.item_viewer_hopping": "Hopping Item Interface (wip)", + "block.actuallyadditions.laser_relay_item_advanced": "Advanced Item Laser Relay (wip)", + "block.actuallyadditions.item_interface": "Item Interface (wip)", + "block.actuallyadditions.hopping_item_interface": "Hopping Item Interface (wip)", "block.actuallyadditions.booklet_stand": "Wall-Mount Manual (wip)", "block.actuallyadditions.display_stand": "Display Stand", "block.actuallyadditions.shock_suppressor": "Shock Absorber (wip)", @@ -277,21 +277,20 @@ "item.actuallyadditions.rice_seeds": "Rice Seeds", "item.actuallyadditions.tiny_coal": "Tiny Coal (wip)", "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal (wip)", - "item.actuallyadditions.rice_slime": "Rice Slimeball (wip)", + "item.actuallyadditions.rice_slimeball": "Rice Slimeball (wip)", "item.actuallyadditions.single_battery": "Single Battery", "item.actuallyadditions.double_battery": "Double Battery", "item.actuallyadditions.triple_battery": "Triple Battery", "item.actuallyadditions.quadruple_battery": "Quadruple Battery", "item.actuallyadditions.quintuple_battery": "Quintuple Battery", - "item.actuallyadditions.growth_ring": "Ring of Growth (wip)", - "item.actuallyadditions.water_removal_ring": "Ring of Liquid Banning (wip)", - "item.actuallyadditions.suction_ring": "Ring of Magnetizing (wip)", + "item.actuallyadditions.ring_of_growth": "Ring of Growth (wip)", + "item.actuallyadditions.ring_of_magnetizing": "Ring of Magnetizing (wip)", "item.actuallyadditions.canola_oil_bucket": "Canola Oil Bucket", "item.actuallyadditions.refined_canola_oil_bucket": "Refined Canola Oil Bucket", "item.actuallyadditions.crystallized_oil_bucket": "Crystallized Oil Bucket", "item.actuallyadditions.empowered_oil_bucket": "Empowered Oil Bucket", "item.actuallyadditions.wings_of_the_bats": "Wings Of The Bats (wip)", - "item.actuallyadditions.bat_wing": "Bat's Wing (wip)", + "item.actuallyadditions.bats_wing": "Bat's Wing (wip)", "item.actuallyadditions.wooden_aiot": "Wooden AIOT (wip)", "item.actuallyadditions.stone_aiot": "Stone AIOT (wip)", "item.actuallyadditions.iron_aiot": "Iron AIOT (wip)", @@ -387,10 +386,10 @@ "item.actuallyadditions.empowered_canola_seed": "Empowered Canola Seed", "item.actuallyadditions.lens_of_the_miner": "Lens of the Miner (wip)", "item.actuallyadditions.lens_of_the_killer": "Lens of the Killer (wip)", - "item.actuallyadditions.filling_wand": "Handheld Filler (wip)", + "item.actuallyadditions.handheld_filler": "Handheld Filler (wip)", "item.actuallyadditions.laser_upgrade_invisibility": "Laser Relay Modifier: Invisibility (wip)", - "item.actuallyadditions.engineer_goggles": "Engineer's Goggles (wip)", - "item.actuallyadditions.engineer_goggles_advanced": "Engineer's Infrared Goggles (wip)", + "item.actuallyadditions.engineers_goggles": "Engineer's Goggles (wip)", + "item.actuallyadditions.engineers_goggles_advanced": "Engineer's Infrared Goggles (wip)", "item.actuallyadditions.laser_upgrade_range": "Laser Relay Modifier: Range (wip)", "item.actuallyadditions.restonia_crystal_shard": "Red Crystal Shard (wip)", "item.actuallyadditions.palis_crystal_shard": "Blue Crystal Shard (wip)", @@ -545,7 +544,7 @@ "container.actuallyadditions.oilGenerator": "Oil Generator", "container.actuallyadditions.phantomPlacer": "Phantom Placer", "container.actuallyadditions.phantomBreaker": "Phantom Breaker", - "container.actuallyadditions.phantomface": "Phantomface", + "container.actuallyadditions.phantom_itemface": "Phantom Itemface", "container.actuallyadditions.liquiface": "Liquiface", "container.actuallyadditions.energyface": "Energyface", "container.actuallyadditions.fluidPlacer": "Fluid Placer", @@ -558,7 +557,7 @@ "container.actuallyadditions.cloud": "Smiley Cloud", "container.actuallyadditions.directionalBreaker": "Long-Range Breaker", "container.actuallyadditions.rangedCollector": "Ranged Collector", - "container.actuallyadditions.miner": "Vertical Digger", + "container.actuallyadditions.vertical_digger": "Vertical Digger", "container.actuallyadditions.laserRelayItemWhitelist": "Laser Relay", "container.actuallyadditions.filter": "Item Filter", "container.actuallyadditions.bag": "Traveler's Sack",