Merge branch 'master' into vbo-wsr

Author: MCTian-mi

src/main/java/gregtech/client/renderer/handler/MultiblockPreviewRenderer.java

@@ -123,7 +123,6 @@ public static void renderControllerInList(MultiblockControllerBase controllerBas
                         controllerPos = new BlockPos(x, y, z);
                         previewFacing = metaTE.getFrontFacing();
                         mte = (MultiblockControllerBase) metaTE;
-                        break;
                     }
                 }
             }

src/main/java/gregtech/integration/jei/JustEnoughItemsModule.java

@@ -363,7 +363,7 @@ private void registerRecipeMapCatalyst(IModRegistry registry, RecipeMap<?> recip
         }
         if (recipeMap.getSmallRecipeMap() != null) {
             registry.addRecipeCatalyst(metaTileEntity.getStackForm(),
-                    GTValues.MODID + ":" + recipeMap.getSmallRecipeMap().unlocalizedName);
+                    GTValues.MODID + "." + recipeMap.getSmallRecipeMap().unlocalizedName);
             return;
         }
 

src/main/java/gregtech/mixins/mui2/LangKeyMixin.java

@@ -3,13 +3,22 @@
 import com.cleanroommc.modularui.drawable.text.BaseKey;
 import com.cleanroommc.modularui.drawable.text.LangKey;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.function.Supplier;
 
 // all this mixin does is switch newlines to the expected format
 @Mixin(value = LangKey.class, remap = false)
 public abstract class LangKeyMixin extends BaseKey {
 
+    @Shadow
+    private long time;
+
     @ModifyExpressionValue(method = "getFormatted",
                            at = @At(value = "INVOKE",
                                     target = "Lcom/cleanroommc/modularui/drawable/text/FontRenderHelper;formatArgs([Ljava/lang/Object;Lcom/cleanroommc/modularui/drawable/text/FormattingState;Ljava/lang/String;Z)Ljava/lang/String;"))
@@ -25,4 +34,11 @@ public String getTranslateKey(String original) {
     public String switchNewLines(String original) {
         return original.replace("/n", "\n");
     }
+
+    @Inject(method = "<init>(Ljava/util/function/Supplier;Ljava/util/function/Supplier;)V",
+            at = @At(value = "RETURN"))
+    private void setTimeToNegativeOne(@NotNull Supplier<String> keySupplier, @NotNull Supplier<Object[]> argsSupplier,
+                                      CallbackInfo ci) {
+        time = -1;
+    }
 }