diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a0058e26b..057e0086b 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-09T22:59:24.7798372 Recipes +// 1.20.4 2024-03-10T22:18:48.1078829 Recipes 4d3128b37a7153882a9324cda49b5069207561c5 data/actuallyadditions/recipes/atomic_reconstructor.json b0367f5012651764931e8b8fd0c5bcca4e8614c0 data/actuallyadditions/recipes/battery_box.json 7e05cd54092b998dfdbd2221235dd52576ec79eb data/actuallyadditions/recipes/black_quartz_block.json @@ -43,6 +43,8 @@ ff81da8a0f6632779414c0512100696a11771814 data/actuallyadditions/recipes/hopping_ 92323ba7b5459abe64c06fff502d44384f64f361 data/actuallyadditions/recipes/laser_relay_advanced.json 31a2978ae8260ead579c6c920be0e40c6036498d data/actuallyadditions/recipes/laser_relay_extreme.json 4acb117a6727554073a78ed81bcd2b0b1af53bec data/actuallyadditions/recipes/laser_relay_item_advanced.json +2c37821d291542d4821842501e07bfad38181553 data/actuallyadditions/recipes/lava_factory_casing.json +76f9eb2b859198eec4c50d992c3715633d5109a8 data/actuallyadditions/recipes/lava_factory_controller.json 73696fd4e851f440a9850485fc9ad03fc63442a9 data/actuallyadditions/recipes/oil_generator.json 8c78ebb9351b98ffe368391a391b90385c0b8b7f data/actuallyadditions/recipes/placer.json 184acfb5fd3799b3fbe35150c67b6530581f8bf1 data/actuallyadditions/recipes/powered_furnace.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json b/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json new file mode 100644 index 000000000..abc1d39e0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": { + "item": "actuallyadditions:iron_casing" + }, + "E": { + "item": "actuallyadditions:enori_crystal_block" + } + }, + "pattern": [ + "ECE" + ], + "result": { + "count": 32, + "item": "actuallyadditions:lava_factory_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/lava_factory_controller.json b/src/generated/resources/data/actuallyadditions/recipes/lava_factory_controller.json new file mode 100644 index 000000000..dd5bf25da --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/lava_factory_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "actuallyadditions:advanced_coil" + }, + "B": { + "item": "minecraft:lava_bucket" + }, + "C": { + "item": "actuallyadditions:iron_casing" + }, + "E": { + "item": "actuallyadditions:empowered_enori_crystal_block" + } + }, + "pattern": [ + "ACA", + "EAE", + "BBB" + ], + "result": { + "item": "actuallyadditions:lava_factory_controller" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index 3d60c1d90..c74d9660b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -339,6 +339,22 @@ public class BlockRecipeGenerator extends RecipeProvider { .pattern("B", "B") .define('B', ActuallyBlocks.BLACK_QUARTZ.getItem()) .save(recipeOutput); + + // Lava Factory Controller + Recipe.shaped(ActuallyBlocks.LAVA_FACTORY_CONTROLLER.getItem()) + .pattern("ACA", "EAE", "BBB") + .define('B', Items.LAVA_BUCKET) + .define('A', ActuallyItems.ADVANCED_COIL.get()) + .define('E', ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL.get()) + .define('C', ActuallyBlocks.IRON_CASING.get()) + .save(recipeOutput); + + // Lava Casing + Recipe.shaped(ActuallyBlocks.LAVA_FACTORY_CASING.getItem(), 32) + .pattern("ECE") + .define('E', ActuallyBlocks.ENORI_CRYSTAL.get()) + .define('C', ActuallyBlocks.IRON_CASING.get()) + .save(recipeOutput); } public static class Recipe { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index df4f90be2..e8092bd2e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -19,6 +19,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; @@ -66,9 +67,9 @@ public class BlockLavaFactoryController extends DirectionalBlock.Container imple if (factory != null) { int state = factory.isMultiblock(); if (state == TileEntityLavaFactoryController.NOT_MULTI) { - StringUtil.drawSplitString(minecraft.font, I18n.get("tooltip." + ActuallyAdditions.MODID + ".factory.notPart.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF, true); + guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".factory.notPart.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF); } else if (state == TileEntityLavaFactoryController.HAS_AIR || state == TileEntityLavaFactoryController.HAS_LAVA) { - StringUtil.drawSplitString(minecraft.font, I18n.get("tooltip." + ActuallyAdditions.MODID + ".factory.works.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF, true); + guiGraphics.drawWordWrap(minecraft.font, Component.translatable("tooltip." + ActuallyAdditions.MODID + ".factory.working.desc"), resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 5, 200, 0xFFFFFF); } } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 13c628675..1636f2063 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -142,8 +142,8 @@ "block.actuallyadditions.phantom_liquiface": "Phantom Liquiface (wip)", "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_casing": "Lava Casing (wip)", + "block.actuallyadditions.lava_factory_controller": "Lava Factory Controller", + "block.actuallyadditions.lava_factory_casing": "Lava Casing", "block.actuallyadditions.fluid_placer": "Fluid Placer", "block.actuallyadditions.fluid_collector": "Fluid Collector", "block.actuallyadditions.phantom_booster": "Phantom Booster (wip)", @@ -407,7 +407,7 @@ "tooltip.actuallyadditions.phantom.notConnected.desc": "This isn't connected to anything!", "tooltip.actuallyadditions.phantom.blockInfo.desc": "The connected Block is %s at %s, %s, %s that is %s Blocks away.", "tooltip.actuallyadditions.factory.notPart.desc": "The Controller isn't part of the right Multi-Block! Look at the Controller's Description!", - "tooltip.actuallyadditions.factory.works.desc": "This Lava Factory is complete and can produce Lava!", + "tooltip.actuallyadditions.factory.working": "This Lava Factory is complete and can produce Lava!", "tooltip.actuallyadditions.oredictName.desc": "OreDictionary Entries", "tooltip.actuallyadditions.noOredictNameAvail.desc": "None", "tooltip.actuallyadditions.codeName.desc": "Code Name",