Merge branch 'refs/heads/1.21.x' into recipe-condition-icons

# Conflicts:
#	src/client/java/aztech/modern_industrialization/compat/viewer/usage/MachineCategory.java
#	src/main/java/aztech/modern_industrialization/machines/recipe/condition/BiomeProcessCondition.java

Author: Swedz

.github/workflows/build.yml

@@ -26,14 +26,9 @@ jobs:
       run: ./gradlew build
       env:
         MI_VERSION: git-${{ steps.var.outputs.commit_hash }}
-    - name: Autotest Server
+    - name: Gametest Server
       run: |
-        rm -rf run || echo "no run directory to remove"
-        mkdir run
-        echo eula=true >> run/eula.txt
-        ./gradlew runAutotestServer --stacktrace
-        ! grep -q FATAL runs/server/logs/latest.log
-        ! grep -q JsonSyntaxException runs/server/logs/latest.log
+        ./gradlew runGameTestServer
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:

build.gradle

@@ -237,9 +237,9 @@ neoForge {
             programArguments.addAll '--mod', "modern_industrialization", '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
         }
 
-        autotestServer {
-            server()
-            systemProperty 'modern_industrialization.autoTest', 'true'
+        gameTestServer {
+            type = "gameTestServer"
+            gameDirectory = project.file("build/gametest")
         }
     }
 }
@@ -252,7 +252,7 @@ configurations {
 dependencies {
     api jarJar("dev.technici4n:GrandPower:${project.grandpower_version}")
 
-    compileOnly "mezz.jei:jei-${project.jei_minecraft_version}-neoforge:${project.jei_version}"
+    compileOnly "mezz.jei:jei-${project.jei_minecraft_version}-neoforge-api:${project.jei_version}"
     if (project.runtime_itemlist_mod == "jei") {
         localRuntimeOnly "mezz.jei:jei-${project.jei_minecraft_version}-neoforge:${project.jei_version}"
     }
@@ -280,7 +280,7 @@ dependencies {
 
     implementation "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
 
-    /*localRuntimeOnly*/ compileOnly("curse.maven:jade-324717:${project.jade_file_id}")
+    localRuntimeOnly compileOnly("curse.maven:jade-324717:${project.jade_file_id}")
 
     // TODO: compileOnly because implementation will cause datagen to crash... hopefully kubejs fixes it soon
     /*localRuntimeOnly*/ compileOnly("dev.latvian.mods:kubejs-neoforge:${project.kubejs_version}")

docs/ADDING_MACHINES.md

@@ -327,12 +327,12 @@ remember that the top, side and bottom textures of a casing must be `modern_indu
 For example:
 ```js
 MIMachineEvents.registerCasings(event => {
-    // Register two casings.
+    // Register a casing.
     // This doesn't register any model! Either add models or add the top/side/bottom textures.
-    event.register("my_fancy_casing", "my_other_casing");
+    event.registerNamed("fancy_casing", "Fancy");
 
     // This registers a new casing with the same model as a diamond block!
-    event.registerBlockImitation("my_diamond_casing", "minecraft:diamond_block");
+    event.registerBlockImitation("diamond_casing", "minecraft:diamond_block");
 })
 ```
 

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.

gradle.properties

@@ -42,9 +42,10 @@ emi_version=1.1.10
 ftb_quests_version=2100.1.3
 ftb_teams_version=2100.1.0
 jade_file_id=5493270
-jei_minecraft_version=1.21
-jei_version=19.8.2.99
-jei_version_range=[19.8.2.99,]
+# JEI Versions https://github.com/mezz/JustEnoughItems#1211
+jei_minecraft_version=1.21.1
+jei_version=19.20.0.241
+jei_version_range=[19.19.0,]
 kubejs_version=2100.7.0-build.102
 patchouli_version=1.21-87-NEOFORGE-SNAPSHOT
 rei_version=16.0.729

src/client/java/aztech/modern_industrialization/MIClient.java

@@ -29,6 +29,7 @@
 import aztech.modern_industrialization.blocks.storage.barrel.DeferredBarrelTextRenderer;
 import aztech.modern_industrialization.blocks.storage.barrel.client.BarrelTooltipComponent;
 import aztech.modern_industrialization.blocks.storage.tank.TankRenderer;
+import aztech.modern_industrialization.client.MIRenderTypes;
 import aztech.modern_industrialization.datagen.MIDatagenClient;
 import aztech.modern_industrialization.datagen.MIDatagenServer;
 import aztech.modern_industrialization.datagen.model.DelegatingModelBuilder;
@@ -96,6 +97,7 @@
 import net.neoforged.neoforge.client.event.RegisterGuiLayersEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
+import net.neoforged.neoforge.client.event.RegisterRenderBuffersEvent;
 import net.neoforged.neoforge.client.event.RenderFrameEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
@@ -163,6 +165,10 @@ private static void init(FMLConstructModEvent ignored) {
                 IConfigScreenFactory.class,
                 (mc, parentScreen) -> AutoConfig.getConfigScreen(MIConfig.class, parentScreen).get());
 
+        modBus.addListener(RegisterRenderBuffersEvent.class, event -> {
+            event.registerRenderBuffer(MIRenderTypes.solidHighlight());
+        });
+
         // Warn if neither JEI nor REI is present!
         if (!ModList.get().isLoaded("emi") && !ModList.get().isLoaded("jei")
                 && !ModList.get().isLoaded("roughlyenoughitems")) {
@@ -210,7 +216,7 @@ private static void registerAdditionalModels(ModelEvent.RegisterAdditional event
 
     private static final List<Runnable> blockEntityRendererRegistrations = new ArrayList<>();
 
-    public static <T extends BlockEntity, U extends T> void registerBlockEntityRenderer(Supplier<BlockEntityType<U>> bet,
+    public static <T extends BlockEntity, U extends T> void registerBlockEntityRenderer(Supplier<? extends BlockEntityType<? extends U>> bet,
             BlockEntityRendererProvider<T> renderer) {
         blockEntityRendererRegistrations.add(() -> BlockEntityRenderers.register(bet.get(), renderer));
     }

src/client/java/aztech/modern_industrialization/client/DynamicTooltip.java

@@ -23,7 +23,7 @@
  */
 package aztech.modern_industrialization.client;
 
-import java.util.ArrayList;
+import aztech.modern_industrialization.util.RenderHelper;
 import java.util.List;
 import java.util.function.Supplier;
 import net.minecraft.client.Minecraft;
@@ -41,10 +41,6 @@ public DynamicTooltip(Supplier<List<Component>> tooltipSupplier) {
 
     @Override
     public List<FormattedCharSequence> toCharSequence(Minecraft minecraft) {
-        List<FormattedCharSequence> charSequences = new ArrayList<>();
-        for (var component : tooltipSupplier.get()) {
-            charSequences.addAll(Tooltip.splitTooltip(minecraft, component));
-        }
-        return charSequences;
+        return RenderHelper.splitTooltip(tooltipSupplier.get());
     }
 }

src/client/java/aztech/modern_industrialization/client/MIRenderTypes.java

@@ -64,7 +64,8 @@ private static RenderType makeMachineOverlay() {
         }
 
         private static RenderType makeSolidHighlight() {
-            return create("solid_highlight", DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.QUADS, 65536, false, false,
+            // Use block vertex format to use the fast path in BufferBuilder, even if the shader doesn't use the extra vertex attributes.
+            return create("solid_highlight", DefaultVertexFormat.BLOCK, VertexFormat.Mode.QUADS, 65536, false, false,
                     CompositeState.builder()
                             .setTransparencyState(NO_TRANSPARENCY)
                             .setTextureState(NO_TEXTURE)

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/impl/jei/DrawableIcon.java

@@ -0,0 +1,60 @@
+/*
+ * 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.compat.viewer.impl.jei;
+
+import aztech.modern_industrialization.compat.viewer.abstraction.ViewerCategory;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.helpers.IGuiHelper;
+import net.minecraft.client.gui.GuiGraphics;
+
+public class DrawableIcon implements IDrawable {
+    private final ViewerCategory.Icon.Texture texture;
+
+    public static IDrawable create(IGuiHelper guiHelper, ViewerCategory.Icon icon) {
+        return switch (icon) {
+        case ViewerCategory.Icon.Stack stack -> guiHelper.createDrawableItemStack(stack.stack());
+        case ViewerCategory.Icon.Texture texture -> new DrawableIcon(texture);
+        case null -> throw new NullPointerException("Icon cannot be null");
+        };
+    }
+
+    public DrawableIcon(ViewerCategory.Icon.Texture texture) {
+        this.texture = texture;
+    }
+
+    @Override
+    public int getWidth() {
+        return 18;
+    }
+
+    @Override
+    public int getHeight() {
+        return 18;
+    }
+
+    @Override
+    public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset) {
+        guiGraphics.blit(texture.loc(), xOffset - 1, yOffset - 1, 0, texture.u(), texture.v(), 18, 18, 256, 256);
+    }
+}