Merge branch '1.21.x' into shape-matcher-api

Author: Technici4n

docs/ADDING_RECIPES.md

@@ -38,6 +38,7 @@ The easiest way to add process conditions is via KubeJS, similarly to how inputs
 Here is the list of currently supported conditions:
 - `dimension(dimension key)`: Requires the machine to be in the specified dimension.
 - `biome(biome key)`: Requires the machine to be in the specified biome.
+- `biomeTag(biome tag key)`: Requires the machine to be in a biome of the specified tag.
 - `adjacentBlock(block, position)`: Requires a specific block to be next to the machine.
   - Position indicates where the block should be.
   - For multiblocks, the position is always relative to the controller.

src/client/java/aztech/modern_industrialization/compat/viewer/impl/MachineScreenPredicateTest.java

@@ -34,10 +34,8 @@ public static boolean test(ReiMachineRecipes.MachineScreenPredicate predicate, M
         case ANY -> true;
         case MULTIBLOCK -> {
             for (GuiComponentClient client : screen.getMenu().components) {
-                if (client instanceof CraftingMultiblockGuiClient cmGui) {
-                    if (cmGui.isShapeValid) {
-                        yield true;
-                    }
+                if (client instanceof CraftingMultiblockGuiClient cmGui && cmGui.isShapeValid) {
+                    yield true;
                 }
             }
             yield false;

src/client/java/aztech/modern_industrialization/compat/viewer/usage/MachineCategory.java

@@ -35,28 +35,24 @@
 import aztech.modern_industrialization.machines.gui.MachineScreen;
 import aztech.modern_industrialization.machines.guicomponents.EnergyBarClient;
 import aztech.modern_industrialization.machines.guicomponents.ProgressBarClient;
-import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes;
 import aztech.modern_industrialization.machines.init.MachineTier;
 import aztech.modern_industrialization.machines.recipe.MachineRecipe;
-import aztech.modern_industrialization.machines.recipe.RecipeConversions;
 import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant;
 import aztech.modern_industrialization.util.TextHelper;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 import java.util.function.Consumer;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.block.ComposterBlock;
 
 public class MachineCategory extends ViewerCategory<RecipeHolder<MachineRecipe>> {
     public static MachineCategory create(MachineCategoryParams params) {
@@ -96,41 +92,10 @@ public void buildWorkstations(WorkstationConsumer consumer) {
 
     @Override
     public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer<RecipeHolder<MachineRecipe>> consumer) {
-        var machineRecipes = recipeManager.getRecipes().stream()
-                .filter(r -> r.value() instanceof MachineRecipe)
-                .map(r -> (RecipeHolder<MachineRecipe>) r)
-                .toList();
-
-        // regular recipes
-        machineRecipes.stream()
-                .filter(r -> params.recipePredicate.test(r.value()))
+        params.recipeType.getRecipesWithoutCache(Minecraft.getInstance().level).stream()
+                .filter(recipe -> params.recipePredicate.test(recipe.value()))
                 .sorted(Comparator.comparing(RecipeHolder::id))
                 .forEach(consumer);
-
-        // converted recipes
-        if (params.category.getNamespace().equals(MI.ID)) {
-            switch (params.category.getPath()) {
-            case "bronze_furnace" -> {
-                recipeManager.getAllRecipesFor(RecipeType.SMELTING)
-                        .stream()
-                        .map(r -> RecipeConversions.ofSmelting(r, MIMachineRecipeTypes.FURNACE, registryAccess))
-                        .forEach(consumer);
-            }
-            case "bronze_cutting_machine" -> {
-                recipeManager.getAllRecipesFor(RecipeType.STONECUTTING)
-                        .stream()
-                        .map(r -> RecipeConversions.ofStonecutting(r, MIMachineRecipeTypes.CUTTING_MACHINE, registryAccess))
-                        .forEach(consumer);
-            }
-            case "centrifuge" -> {
-                ComposterBlock.COMPOSTABLES.keySet()
-                        .stream()
-                        .map(RecipeConversions::ofCompostable)
-                        .filter(Objects::nonNull)
-                        .forEach(consumer);
-            }
-            }
-        }
     }
 
     @Override

src/client/java/aztech/modern_industrialization/machines/gui/MachineMenuClient.java

@@ -27,6 +27,7 @@
 import aztech.modern_industrialization.inventory.ConfigurableItemStack;
 import aztech.modern_industrialization.inventory.MIInventory;
 import aztech.modern_industrialization.inventory.SlotPositions;
+import aztech.modern_industrialization.machines.ComponentStorage;
 import aztech.modern_industrialization.machines.GuiComponentsClient;
 import aztech.modern_industrialization.util.NbtHelper;
 import java.util.ArrayList;
@@ -52,34 +53,29 @@ public static MachineMenuClient create(int syncId, Inventory playerInventory, Re
         SlotPositions fluidPositions = SlotPositions.read(buf);
         MIInventory inventory = new MIInventory(itemStacks, fluidStacks, itemPositions, fluidPositions);
         // Components
-        List<GuiComponentClient> components = new ArrayList<>();
+        ComponentStorage<GuiComponentClient> components = new ComponentStorage<>();
         int componentCount = buf.readInt();
         for (int i = 0; i < componentCount; ++i) {
             ResourceLocation id = buf.readResourceLocation();
-            components.add(GuiComponentsClient.get(id).createFromInitialData(buf));
+            components.register(GuiComponentsClient.get(id).createFromInitialData(buf));
         }
         // GUI params
         MachineGuiParameters guiParams = MachineGuiParameters.read(buf);
 
         return new MachineMenuClient(syncId, playerInventory, inventory, components, guiParams);
     }
 
-    public final List<GuiComponentClient> components;
+    public final ComponentStorage<GuiComponentClient> components;
 
-    private MachineMenuClient(int syncId, Inventory playerInventory, MIInventory inventory, List<GuiComponentClient> components,
+    private MachineMenuClient(int syncId, Inventory playerInventory, MIInventory inventory, ComponentStorage<GuiComponentClient> components,
             MachineGuiParameters guiParams) {
         super(syncId, playerInventory, inventory, guiParams, components);
         this.components = components;
     }
 
     @Nullable
     public <T extends GuiComponentClient> T getComponent(Class<T> klass) {
-        for (GuiComponentClient component : components) {
-            if (klass.isInstance(component)) {
-                return (T) component;
-            }
-        }
-        return null;
+        return components.get(klass);
     }
 
     @Override

src/client/java/aztech/modern_industrialization/machines/gui/MachineScreen.java

@@ -212,9 +212,13 @@ protected void renderBg(GuiGraphics guiGraphics, float delta, int mouseX, int mo
     private void renderConfigurableSlotBackgrounds(GuiGraphics guiGraphics) {
         for (Slot slot : this.menu.slots) {
             if (slot instanceof BackgroundRenderedSlot brs) {
+                var atlas = brs.getBackgroundAtlasLocation();
+                if (atlas == null) {
+                    continue;
+                }
                 int px = leftPos + slot.x - 1;
                 int py = topPos + slot.y - 1;
-                guiGraphics.blit(SLOT_ATLAS, px, py, brs.getBackgroundU(), brs.getBackgroundV(), 18, 18);
+                guiGraphics.blit(atlas, px, py, brs.getBackgroundU(), brs.getBackgroundV(), 18, 18);
             }
         }
     }

src/client/java/aztech/modern_industrialization/machines/multiblocks/MultiblockMachineBER.java

@@ -71,7 +71,8 @@ public void render(MultiblockMachineBlockEntity be, float tickDelta, PoseStack m
                 }
                 if (drawHighlights) {
                     if (!matcher.matches(pos, be.getLevel(), null)) {
-                        if (be.getLevel().getBlockState(pos).isAir()) {
+                        var existingState = be.getLevel().getBlockState(pos);
+                        if (existingState.isAir() || /* approximate check for e.g. grass and snow */ existingState.canBeReplaced()) {
                             // Enqueue state preview
                             MultiblockErrorHighlight.enqueueHighlight(pos, matcher.getSimpleMember(pos).getPreviewState());
                         } else {

src/generated/resources/data/modern_industrialization/data_maps/item/item_pipe_upgrades.json

@@ -1,13 +1,13 @@
 {
   "values": {
     "modern_industrialization:advanced_motor": {
-      "maxExtractedItems": 32
+      "maxExtractedItems": 64
     },
     "modern_industrialization:large_advanced_motor": {
-      "maxExtractedItems": 64
+      "maxExtractedItems": 512
     },
     "modern_industrialization:large_motor": {
-      "maxExtractedItems": 8
+      "maxExtractedItems": 16
     },
     "modern_industrialization:motor": {
       "maxExtractedItems": 2

src/main/java/aztech/modern_industrialization/api/energy/CableTierHolder.java

@@ -0,0 +1,28 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.api.energy;
+
+public interface CableTierHolder {
+    CableTier getCableTier();
+}

src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java

@@ -28,9 +28,11 @@
 import aztech.modern_industrialization.machines.recipe.condition.CustomProcessCondition;
 import aztech.modern_industrialization.machines.recipe.condition.DimensionProcessCondition;
 import aztech.modern_industrialization.machines.recipe.condition.MachineProcessCondition;
+import com.mojang.datafixers.util.Either;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
 
 public interface ProcessConditionHelper {
@@ -45,7 +47,11 @@ default ProcessConditionHelper adjacentBlock(Block block, String relativePositio
     }
 
     default ProcessConditionHelper biome(ResourceLocation biome) {
-        return processCondition(new BiomeProcessCondition(ResourceKey.create(Registries.BIOME, biome)));
+        return processCondition(new BiomeProcessCondition(Either.left(ResourceKey.create(Registries.BIOME, biome))));
+    }
+
+    default ProcessConditionHelper biomeTag(ResourceLocation tag) {
+        return processCondition(new BiomeProcessCondition(Either.right(TagKey.create(Registries.BIOME, tag))));
     }
 
     default ProcessConditionHelper customCondition(String id) {

src/main/java/aztech/modern_industrialization/compat/rei/machines/MachineCategoryParams.java

@@ -26,6 +26,7 @@
 import aztech.modern_industrialization.inventory.SlotPositions;
 import aztech.modern_industrialization.machines.guicomponents.ProgressBar;
 import aztech.modern_industrialization.machines.recipe.MachineRecipe;
+import aztech.modern_industrialization.machines.recipe.MachineRecipeType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
@@ -39,21 +40,23 @@ public class MachineCategoryParams {
     public final SlotPositions fluidInputs;
     public final SlotPositions fluidOutputs;
     public final ProgressBar.Parameters progressBarParams;
+    public final MachineRecipeType recipeType;
     public final Predicate<MachineRecipe> recipePredicate;
     public final boolean isMultiblock;
     public final SteamMode steamMode;
     public final List<ResourceLocation> workstations = new ArrayList<>();
 
     public MachineCategoryParams(String englishName, ResourceLocation category, SlotPositions itemInputs, SlotPositions itemOutputs,
-            SlotPositions fluidInputs, SlotPositions fluidOutputs, ProgressBar.Parameters progressBarParams, Predicate<MachineRecipe> recipePredicate,
-            boolean isMultiblock, SteamMode steamMode) {
+            SlotPositions fluidInputs, SlotPositions fluidOutputs, ProgressBar.Parameters progressBarParams, MachineRecipeType recipeType,
+            Predicate<MachineRecipe> recipePredicate, boolean isMultiblock, SteamMode steamMode) {
         this.englishName = englishName;
         this.category = category;
         this.itemInputs = itemInputs;
         this.itemOutputs = itemOutputs;
         this.fluidInputs = fluidInputs;
         this.fluidOutputs = fluidOutputs;
         this.progressBarParams = progressBarParams;
+        this.recipeType = recipeType;
         this.recipePredicate = recipePredicate;
         this.isMultiblock = isMultiblock;
         this.steamMode = steamMode;