Merge Fixes III

src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java

@@ -22,6 +22,7 @@
 import com.simibubi.create.foundation.utility.Lang;
 
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import io.github.fabricators_of_create.porting_lib.util.KeyBindingHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;

src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java

@@ -7,9 +7,10 @@
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
-import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 
 import dev.engine_room.flywheel.lib.model.baked.PartialModel;
+import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;

src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java

@@ -1,7 +1,5 @@
 package com.simibubi.create.content.redstone.nixieTube;
 
-import net.minecraft.util.RandomSource;
-
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.content.redstone.nixieTube.DoubleFaceAttachedBlock.DoubleAttachFace;
@@ -13,10 +11,10 @@
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.DyeHelper;
-
 import com.simibubi.create.foundation.utility.Iterate;
 
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import io.github.fabricators_of_create.porting_lib.util.FontRenderUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.font.glyphs.BakedGlyph;
@@ -27,6 +25,7 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Style;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;

src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java

@@ -10,6 +10,7 @@
 
 import dev.engine_room.flywheel.lib.model.baked.PartialModel;
 import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.TagValueAccessor;
+import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.resources.ResourceLocation;

src/main/java/com/simibubi/create/foundation/render/ShadedBlockSbbBuilder.java

@@ -61,24 +61,12 @@ public void putBulkData(PoseStack.Pose pose, BakedQuad quad, float red, float gr
  bufferBuilder.putBulkData(pose, quad, red, green, blue, light, overlay);
  }
 
- @Override
- public void putBulkData(PoseStack.Pose pose, BakedQuad quad, float red, float green, float blue, float alpha, int light, int overlay, boolean readExistingColor) {
- prepareForGeometry(quad);
- bufferBuilder.putBulkData(pose, quad, red, green, blue, alpha, light, overlay, readExistingColor);
- }
-
  @Override
  public void putBulkData(PoseStack.Pose pose, BakedQuad quad, float[] brightnesses, float red, float green, float blue, int[] lights, int overlay, boolean readExistingColor) {
  prepareForGeometry(quad);
  bufferBuilder.putBulkData(pose, quad, brightnesses, red, green, blue, lights, overlay, readExistingColor);
  }
 
- @Override
- public void putBulkData(PoseStack.Pose pose, BakedQuad quad, float[] brightnesses, float red, float green, float blue, float alpha, int[] lights, int overlay, boolean readExistingColor) {
- prepareForGeometry(quad);
- bufferBuilder.putBulkData(pose, quad, brightnesses, red, green, blue, alpha, lights, overlay, readExistingColor);
- }
-
  @Override
  public VertexConsumer vertex(double x, double y, double z) {
  throw new UnsupportedOperationException("ShadedBlockSbbBuilder only supports putBulkData!");

src/main/java/com/simibubi/create/foundation/render/VirtualRenderHelper.java

@@ -2,6 +2,8 @@
 
 import java.nio.ByteBuffer;
 
+import dev.engine_room.flywheel.lib.model.baked.FabricBakedModelBuilder;
+
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -19,16 +21,9 @@
 import net.minecraft.world.level.block.state.BlockState;
 
 public class VirtualRenderHelper {
- public static final ModelProperty<Boolean> VIRTUAL_PROPERTY = new ModelProperty<>();
- public static final ModelData VIRTUAL_DATA = ModelData.builder().with(VIRTUAL_PROPERTY, true).build();
-
- private static final ModelCache<BlockState> VIRTUAL_BLOCKS = new ModelCache<>(state -> new ForgeBakedModelBuilder(ModelUtil.VANILLA_RENDERER.getBlockModel(state)).modelData(VIRTUAL_DATA).build());
+ private static final ModelCache<BlockState> VIRTUAL_BLOCKS = new ModelCache<>(state -> new FabricBakedModelBuilder(ModelUtil.VANILLA_RENDERER.getBlockModel(state)).modelData(VIRTUAL_DATA).build());
  private static final ThreadLocal<ThreadLocalObjects> THREAD_LOCAL_OBJECTS = ThreadLocal.withInitial(ThreadLocalObjects::new);
 
- public static boolean isVirtual(ModelData data) {
- return data.has(VirtualRenderHelper.VIRTUAL_PROPERTY) && data.get(VirtualRenderHelper.VIRTUAL_PROPERTY);
- }
-
  /**
  * A copy of {@link dev.engine_room.flywheel.lib.model.Models#block(BlockState)}, but with virtual model data passed in.
  * @param state The block state to get the model for.
@@ -59,9 +54,8 @@ public static SuperByteBuffer bufferModel(BakedModel model, BlockState state, @N
  ShadedBlockSbbBuilder sbbBuilder = objects.sbbBuilder;
  sbbBuilder.begin();
 
- ModelData modelData = model.getModelData(VirtualEmptyBlockGetter.FULL_DARK, BlockPos.ZERO, state, VIRTUAL_DATA);
  poseStack.pushPose();
- renderer.tesselateBlock(VirtualEmptyBlockGetter.FULL_DARK, model, state, BlockPos.ZERO, poseStack, sbbBuilder, false, random, 42L, OverlayTexture.NO_OVERLAY, modelData, null);
+ renderer.tesselateBlock(VirtualEmptyBlockGetter.FULL_DARK, model, state, BlockPos.ZERO, poseStack, sbbBuilder, false, random, 42L, OverlayTexture.NO_OVERLAY);
  poseStack.popPose();
 
  return sbbBuilder.end();

src/main/java/com/simibubi/create/foundation/virtualWorld/VirtualChunk.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
-import java.util.function.BiPredicate;
+import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
 
@@ -177,11 +177,11 @@ public CompoundTag getBlockEntityNbtForSaving(BlockPos pos) {
  }
 
  @Override
- public void findBlocks(BiPredicate<BlockState, BlockPos> predicate, BiConsumer<BlockPos, BlockState> consumer) {
+ public void findBlocks(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> output) {
  world.blockStates.forEach((pos, state) -> {
  if (SectionPos.blockToSectionCoord(pos.getX()) == chunkPos.x && SectionPos.blockToSectionCoord(pos.getZ()) == chunkPos.z) {
- if (predicate.test(state, pos)) {
- consumer.accept(pos, state);
+ if (predicate.test(state)) {
+ output.accept(pos, state);
  }
  }
  });