diff --git a/build.gradle b/build.gradle index 3bdf28498..b72d75357 100644 --- a/build.gradle +++ b/build.gradle @@ -209,8 +209,8 @@ dependencies { // runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:3956498") // runtimeOnly fg.deobf("curse.maven:flib-661261:3956196") // runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:3854062") - // runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69") - // runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984") + // runtimeOnly fg.deobf("vazkii.autoreglib:AutoRegLib:1.7-53.111") + // runtimeOnly fg.deobf("vazkii.quark:Quark:3.2-358.2") // runtimeOnly fg.deobf("curse.maven:mantle-74924:4509007") // runtimeOnly fg.deobf("curse.maven:tinkers-construct-74072:4509008") // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3") @@ -236,6 +236,8 @@ dependencies { // runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676") // runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4365140") // runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478") + // runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478") + // runtimeOnly fg.deobf("curse.maven:environmental-388992:4381294") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings 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..f5b6c4dc4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:cherry_log" + } + ], + "results": [ + { + "item": "environmental:stripped_cherry_log" + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..702a14d2e --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:cherry_wood" + } + ], + "results": [ + { + "item": "environmental:stripped_cherry_wood" + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..ef0fa5369 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:stripped_cherry_log" + } + ], + "results": [ + { + "item": "environmental:cherry_planks", + "count": 6 + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..372baaf27 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:stripped_cherry_wood" + } + ], + "results": [ + { + "item": "environmental:cherry_planks", + "count": 6 + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..48a0eca94 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:stripped_willow_log" + } + ], + "results": [ + { + "item": "environmental:willow_planks", + "count": 6 + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..66e544fd4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:stripped_willow_wood" + } + ], + "results": [ + { + "item": "environmental:willow_planks", + "count": 6 + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..880f60250 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:stripped_wisteria_log" + } + ], + "results": [ + { + "item": "environmental:wisteria_planks", + "count": 6 + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..3f429af19 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:stripped_wisteria_wood" + } + ], + "results": [ + { + "item": "environmental:wisteria_planks", + "count": 6 + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..69125bfef --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:willow_log" + } + ], + "results": [ + { + "item": "environmental:stripped_willow_log" + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..eff0b4dc8 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:willow_wood" + } + ], + "results": [ + { + "item": "environmental:stripped_willow_wood" + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..e26a0fb29 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:wisteria_log" + } + ], + "results": [ + { + "item": "environmental:stripped_wisteria_log" + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ 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..59e57ae33 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "environmental:wisteria_wood" + } + ], + "results": [ + { + "item": "environmental:stripped_wisteria_wood" + } + ], + "processingTime": 50, + "conditions": [ + { + "modid": "environmental", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file 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/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 7af9ea3b1..f38f976a3 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 @@ -153,7 +154,11 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { RU_12 = stripAndMakePlanks(Mods.RU, "ashen_log", "stripped_dead_log", null), RU_13 = stripAndMakePlanks(Mods.RU, "ashen_wood", "stripped_dead_wood", null), 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") + RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood"), + + // Environmental + + ENV = cuttingCompat(Mods.ENV, "willow", "cherry", "wisteria") ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) {