diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index 405e2d1b1..5d8e5438c 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.19.2 2024-08-07T13:26:27.8886754 Create's Processing Recipes +// 1.19.2 2024-08-07T15:05:58.7776609 Create's Processing Recipes 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json @@ -458,6 +458,18 @@ e4c5b799335a71a4259de6519ff9fe86fc014c85 data/create/recipes/cutting/compat/ecol 45734ddd48ac17b25b88cf1f5b0d227431946cf7 data/create/recipes/cutting/compat/ecologics/walnut_wood.json b0be23a2a268557b1ab26518a9d6ff1e492068fa data/create/recipes/cutting/compat/endergetic/poise_stem.json 1581ae3f152ba5784d6b737ed37e0fe8e6317a76 data/create/recipes/cutting/compat/endergetic/stripped_poise_stem.json +513c32af17004085c152de0c50ecdc0821ad5736 data/create/recipes/cutting/compat/environmental/cherry_log.json +dd7f392a18fa58dbcd02e1700a89d847ef912f6a data/create/recipes/cutting/compat/environmental/cherry_wood.json +bb5be6efdf3a134baed80179e9f65a5e9402e001 data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json +8938bac54128e55540b9061333cebadb615c5531 data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json +962dd25663096fe3883f0aa5a89cea00c312625a data/create/recipes/cutting/compat/environmental/stripped_willow_log.json +ee28f2a0519c41df80647ec643d20b3ce05d5ca7 data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json +bfa59f4024105be24f441ec9e1fe2394bb4c32ed data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json +15cb849317c8038750000708c93cce535d7662e5 data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json +9c9b4b63d736e9bef583e3e3085df9547bee1ad3 data/create/recipes/cutting/compat/environmental/willow_log.json +6a6b47c7c058fe67ea0f0f479145e0e921fcd571 data/create/recipes/cutting/compat/environmental/willow_wood.json +590fa0d5dbc357c4d22f7e79f94365c50ca1c812 data/create/recipes/cutting/compat/environmental/wisteria_log.json +62b927056738fbbbb1ceb7b2b3f23e45c94cdd1b data/create/recipes/cutting/compat/environmental/wisteria_wood.json 97d07cbd21b147d93cbfea6534258f0b5faabbbb data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json b08980c7deb9a4de4983fdae188f0c5ac627c1e5 data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json 6d4536b52410f319b7848c0a21d18f1e16e6ad4b data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json new file mode 100644 index 000000000..bda9bed09 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:cherry_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "environmental:stripped_cherry_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json new file mode 100644 index 000000000..51f682484 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:cherry_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "environmental:stripped_cherry_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json new file mode 100644 index 000000000..43d753bcf --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:stripped_cherry_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "environmental:cherry_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json new file mode 100644 index 000000000..887f1ef54 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:stripped_cherry_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "environmental:cherry_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json new file mode 100644 index 000000000..e38effb69 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:stripped_willow_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "environmental:willow_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json new file mode 100644 index 000000000..f326983c3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:stripped_willow_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "environmental:willow_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json new file mode 100644 index 000000000..27d94422b --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:stripped_wisteria_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "environmental:wisteria_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json new file mode 100644 index 000000000..2a6b8a233 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:stripped_wisteria_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "environmental:wisteria_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json new file mode 100644 index 000000000..94404afcd --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:willow_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "environmental:stripped_willow_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json new file mode 100644 index 000000000..fde447308 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:willow_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "environmental:stripped_willow_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json new file mode 100644 index 000000000..b5d06e6ff --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:wisteria_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "environmental:stripped_wisteria_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json new file mode 100644 index 000000000..0ac29cdef --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "environmental" + } + ], + "ingredients": [ + { + "item": "environmental:wisteria_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "environmental:stripped_wisteria_wood" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java index 983f67c37..c157ed192 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java +++ b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.contraptions; import java.util.Arrays; import java.util.List; -import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.item.TooltipHelper.Palette; import com.simibubi.create.foundation.utility.Components; @@ -28,7 +27,7 @@ public interface IDisplayAssemblyExceptions { String text = e.component.getString(); Arrays.stream(text.split("\n")) .forEach(l -> TooltipHelper.cutStringTextComponent(l, Palette.GRAY_AND_WHITE) - .forEach(c -> Lang.text(c.getString()).forGoggles(tooltip))); + .forEach(c -> Lang.builder().add(c).forGoggles(tooltip))); return true; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java index 240f74575..6d517c8ab 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java +++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java @@ -3,9 +3,9 @@ package com.simibubi.create.content.contraptions; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -48,8 +48,8 @@ public class MountedStorageManager { protected Map fluidStorage; public MountedStorageManager() { - storage = new HashMap<>(); - fluidStorage = new HashMap<>(); + storage = new TreeMap<>(); + fluidStorage = new TreeMap<>(); } public void entityTick(AbstractContraptionEntity entity) { diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java index 0f8d746db..c6b2753db 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java @@ -11,7 +11,6 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock; import com.simibubi.create.content.decoration.steamWhistle.WhistleBlockEntity; -import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.content.kinetics.BlockStressValues; import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlock; import com.simibubi.create.foundation.advancement.AdvancementBehaviour; @@ -151,9 +150,9 @@ public class BoilerData { Lang.translate("boiler.status", getHeatLevelTextComponent().withStyle(ChatFormatting.GREEN)) .forGoggles(tooltip); - Lang.text(getSizeComponent(true, false).getString()).forGoggles(tooltip, 1); - Lang.text(getWaterComponent(true, false).getString()).forGoggles(tooltip, 1); - Lang.text(getHeatComponent(true, false).getString()).forGoggles(tooltip, 1); + Lang.builder().add(getSizeComponent(true, false)).forGoggles(tooltip, 1); + Lang.builder().add(getWaterComponent(true, false)).forGoggles(tooltip, 1); + Lang.builder().add(getHeatComponent(true, false)).forGoggles(tooltip, 1); if (attachedEngines == 0) return true; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 66abc6843..9c101b46f 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -9,6 +9,7 @@ import net.minecraft.world.level.block.Blocks; import java.util.Objects; +@SuppressWarnings("unused") public class CuttingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe @@ -155,6 +156,10 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { RU_14 = stripOnlyDiffModId(Mods.RU, "silver_birch_log", Mods.MC, "stripped_birch_log"), RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood"), + // Environmental + + ENV = cuttingCompat(Mods.ENV, "willow", "cherry", "wisteria"), + // Windswept WSP = cuttingCompat(Mods.WSP, "holly", "chestnut"), @@ -162,6 +167,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { // Good Ending GOOD = cuttingCompat(Mods.GOOD, "muddy_oak", "cypress") + ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index 1d2f4e217..a46a2f410 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -32,7 +32,7 @@ public class TooltipHelper { Component hint = Lang.translateDirect(hintKey); List cutComponent = cutTextComponent(hint, Palette.GRAY_AND_WHITE); for (Component component : cutComponent) - Lang.text(component.getString()).forGoggles(tooltip); + Lang.builder().add(component).forGoggles(tooltip); } public static String makeProgressBar(int length, int filledLength) { diff --git a/src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java b/src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java index 161f52dd4..ff67e62a3 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java @@ -2,8 +2,6 @@ package com.simibubi.create.foundation.utility; import java.util.List; -import com.simibubi.create.compat.Mods; - import joptsimple.internal.Strings; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -96,6 +94,19 @@ public class LangBuilder { return this; } + /** + * Appends a component + * + * @param component the component to append + * @return this builder + */ + public LangBuilder add(Component component) { + if (component instanceof MutableComponent mutableComponent) + return add(mutableComponent); + else + return add(component.copy()); + } + // /**