Merge branch 'mc1.18/fabric/dev' into mc1.19/fabric/dev

# Conflicts:
#	src/main/resources/fabric.mod.json

FABRIC_CHANGELOG.txt

@@ -18,3 +18,4 @@ Change logging starts below:
 - fix basin tooltips not updating when removing fluid (#1411)
 - fix outputs of draining recipes not being indexed (#1409)
 - fix incorrect chances being shown on fan recipes (#1393)
+- fix stress tooltips not being shown until entering singleplayer (#1265)

src/main/java/com/simibubi/create/Create.java

@@ -170,8 +170,7 @@ public static void init() {
 			AllFluids.registerFluidInteractions();
 //		--
 
-			// fabric: registration not done yet, do it later
-			ServerLifecycleEvents.SERVER_STARTING.register(server -> AttachedRegistry.unwrapAll());
+			// fabric: AttachedRegistry.unwrapAll moved to RegistryMixin
 			AllAdvancements.register();
 			AllTriggers.register();
 //		});

src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java

@@ -81,13 +81,18 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
 			}
 		}
 
+		// fabric: If it is the default state do not push transformations, will cause issues with GhostBlockRenderer
+		boolean shouldTransform = material != AllBlocks.COPYCAT_BASE.getDefaultState();
+
 		// fabric: need to change the default render material
-		context.pushTransform(MaterialFixer.create(material));
+		if (shouldTransform)
+			context.pushTransform(MaterialFixer.create(material));
 
 		emitBlockQuadsInner(blockView, state, pos, randomSupplier, context, material, cullFaceRemovalData, occlusionData);
 
 		// fabric: pop the material changer transform
-		context.popTransform();
+		if (shouldTransform)
+			context.popTransform();
 	}
 
 	protected abstract void emitBlockQuadsInner(BlockAndTintGetter blockView, BlockState state, BlockPos pos, Supplier<RandomSource> randomSupplier, RenderContext context, BlockState material, CullFaceRemovalData cullFaceRemovalData, OcclusionData occlusionData);

src/main/java/com/simibubi/create/foundation/mixin/fabric/BlockableEventLoopAccessor.java

@@ -0,0 +1,14 @@
+package com.simibubi.create.foundation.mixin.fabric;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import net.minecraft.util.thread.BlockableEventLoop;
+
+@Mixin(BlockableEventLoop.class)
+public interface BlockableEventLoopAccessor {
+	@Invoker
+	CompletableFuture<Void> callSubmitAsync(Runnable task);
+}

src/main/java/com/simibubi/create/foundation/mixin/fabric/RegistryMixin.java

@@ -0,0 +1,18 @@
+package com.simibubi.create.foundation.mixin.fabric;
+
+import com.simibubi.create.foundation.utility.AttachedRegistry;
+
+import net.minecraft.core.Registry;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Registry.class)
+public class RegistryMixin {
+	@Inject(method = "freezeBuiltins", at = @At("TAIL"))
+	private static void unwrapAttached(CallbackInfo ci) {
+		AttachedRegistry.unwrapAll();
+	}
+}

src/main/java/com/simibubi/create/foundation/networking/SimplePacketBase.java

@@ -1,6 +1,6 @@
 package com.simibubi.create.foundation.networking;
 
-import java.util.concurrent.Executor;
+import com.simibubi.create.foundation.mixin.fabric.BlockableEventLoopAccessor;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -15,6 +15,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.util.thread.BlockableEventLoop;
 
 public abstract class SimplePacketBase implements C2SPacket, S2CPacket {
 
@@ -42,9 +43,16 @@ public enum NetworkDirection {
 		PLAY_TO_SERVER
 	}
 
-	public record Context(Executor exec, PacketListener listener, @Nullable ServerPlayer sender) {
+	public record Context(BlockableEventLoop<? extends Runnable> executor, PacketListener listener, @Nullable ServerPlayer sender) {
 		public void enqueueWork(Runnable runnable) {
-			exec().execute(runnable);
+			// Matches Forge's enqueueWork behavior.
+			// MC will sometimes defer tasks even if already on the right thread.
+			if (executor.isSameThread()) {
+				runnable.run();
+			} else {
+				// skip extra checks
+				((BlockableEventLoopAccessor) executor).callSubmitAsync(runnable);
+			}
 		}
 
 		@Nullable

src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java

@@ -4,6 +4,7 @@
 import com.jozufozu.flywheel.fabric.model.DefaultLayerFilteringBakedModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.simibubi.create.content.decoration.copycat.CopycatModel;
 import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 

src/main/resources/create.mixins.json

@@ -22,7 +22,9 @@
     "accessor.ServerLevelAccessor",
     "accessor.SystemReportAccessor",
     "fabric.AbstractMinecartMixin",
+    "fabric.BlockableEventLoopAccessor",
     "fabric.EntityMixin",
+    "fabric.RegistryMixin",
     "fabric.ServerGamePacketListenerImplAccessor",
     "fabric.SortedArraySetAccessor",
     "fabric.StructureUtilsMixin"

src/main/resources/fabric.mod.json

@@ -77,7 +77,9 @@
 
     "railways": "<1.5.3",
     "create_interactive": "<=1.0.1-beta.2",
-    "create_jetpack": "<=3.4.1"
+    "create_jetpack": "<=3.4.1",
+    "garnished": "<=1.6.3",
+    "extendedbogeys": "<=0.4.5"
   },
 
   "custom": {