Merge Fixes I

build.gradle

@@ -64,7 +64,7 @@ def dependencies(DependencyHandler deps) {
     deps.modApi(deps.include("com.electronwill.night-config:core:$night_config_version"))
     deps.modApi(deps.include("com.electronwill.night-config:toml:$night_config_version"))
     deps.modApi(deps.include("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:$forge_config_api_port_version"))
-    deps.modApi(deps.include("com.jozufozu.flywheel:flywheel-fabric-$flywheel_minecraft_version:$flywheel_version"))
+    deps.modApi(deps.include("dev.engine_room.flywheel:flywheel-fabric-$flywheel_minecraft_version:$flywheel_version"))
     deps.modApi(deps.include("com.jamieswhiteshirt:reach-entity-attributes:$reach_entity_attributes_version"))
     deps.modApi(deps.include("io.github.tropheusj:milk-lib:$milk_lib_version"))
     deps.api(deps.include("com.google.code.findbugs:jsr305:$jsr305_version"))

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

@@ -1,14 +1,12 @@
 package com.simibubi.create;
 
-import com.jozufozu.flywheel.fabric.event.FlywheelEvents;
 import com.simibubi.create.compat.Mods;
 import com.simibubi.create.compat.sodium.SodiumCompat;
 import com.simibubi.create.compat.trinkets.Trinkets;
 import com.simibubi.create.content.contraptions.glue.SuperGlueSelectionHandler;
 import com.simibubi.create.content.contraptions.render.ContraptionRenderInfo;
 import com.simibubi.create.content.contraptions.render.ContraptionRenderInfoManager;
 import com.simibubi.create.content.decoration.encasing.CasingConnectivity;
-import com.simibubi.create.content.equipment.armor.AllArmorMaterials;
 import com.simibubi.create.content.equipment.armor.RemainingAirOverlay;
 import com.simibubi.create.content.equipment.bell.SoulPulseEffectHandler;
 import com.simibubi.create.content.equipment.blueprint.BlueprintOverlayRenderer;
@@ -80,12 +78,8 @@ public class CreateClient implements ClientModInitializer {
 
 	public static final ClientResourceReloadListener RESOURCE_RELOAD_LISTENER = new ClientResourceReloadListener();
 
-	public static void onCtorClient(IEventBus modEventBus, IEventBus forgeEventBus) {
-		modEventBus.addListener(CreateClient::clientInit);
-		modEventBus.addListener(AllParticleTypes::registerFactories);
-
-		modEventBus.addListener(StitchedSprite::onTextureStitchPost);
-
+	@Override
+	public void onInitializeClient() {
 		AllInstanceTypes.init();
 
 		MODEL_SWAPPER.registerListeners();

src/main/java/com/simibubi/create/compat/emi/CreateEmiAnimations.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
@@ -24,6 +23,7 @@
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import dev.emi.emi.api.widget.WidgetHolder;
+import dev.engine_room.flywheel.lib.model.baked.PartialModel;
 import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;

src/main/java/com/simibubi/create/compat/rei/category/animations/AnimatedBlazeBurner.java

@@ -1,6 +1,5 @@
 package com.simibubi.create.compat.rei.category.animations;
 
-import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
@@ -11,6 +10,8 @@
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
+
+import dev.engine_room.flywheel.lib.model.baked.PartialModel;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.LightTexture;

src/main/java/com/simibubi/create/compat/rei/category/animations/AnimatedCrafter.java

@@ -1,10 +1,10 @@
 package com.simibubi.create.compat.rei.category.animations;
 
-import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 
+import dev.engine_room.flywheel.lib.transform.TransformStack;
 import net.minecraft.client.gui.GuiGraphics;
 
 public class AnimatedCrafter extends AnimatedKinetics {
@@ -17,7 +17,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
 		AllGuiTextures.JEI_SHADOW.render(graphics, -16, 13);
 
 		matrixStack.translate(3, 16, 0);
-		TransformStack.cast(matrixStack)
+		TransformStack.of(matrixStack)
 			.rotateX(-12.5f)
 			.rotateY(-22.5f);
 		int scale = 22;

src/main/java/com/simibubi/create/compat/rei/category/animations/AnimatedKinetics.java

@@ -1,14 +1,14 @@
 package com.simibubi.create.compat.rei.category.animations;
 
-import com.jozufozu.flywheel.core.PartialModel;
-import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.compat.rei.widgets.AnimatedKineticsWidget;
 import com.simibubi.create.foundation.gui.CustomLightingSettings;
 import com.simibubi.create.foundation.gui.ILightingSettings;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
+import dev.engine_room.flywheel.lib.model.baked.PartialModel;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;

src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java

@@ -11,6 +11,8 @@
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;

src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java

@@ -21,11 +21,12 @@
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
-import io.github.fabricators_of_create.porting_lib.util.LazyOptional;
-import io.github.fabricators_of_create.porting_lib.util.MinecartAndRailUtil;
-import io.github.fabricators_of_create.porting_lib.util.NBTSerializer;
 
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import io.github.fabricators_of_create.porting_lib.util.MinecartAndRailUtil;
+import io.github.fabricators_of_create.porting_lib.util.NBTSerializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java

@@ -16,6 +16,8 @@
 
 import dev.engine_room.flywheel.api.visualization.VisualizationContext;
 import dev.engine_room.flywheel.api.visualization.VisualizationManager;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java

@@ -21,6 +21,8 @@
 import dev.engine_room.flywheel.api.visualization.VisualizationContext;
 import dev.engine_room.flywheel.api.visualization.VisualizationManager;
 import dev.engine_room.flywheel.lib.model.baked.PartialModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;

src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java

@@ -8,6 +8,11 @@
 import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import dev.engine_room.flywheel.api.visualization.VisualizationContext;
+import io.github.fabricators_of_create.porting_lib.transfer.TransferUtil;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.item.ItemEntity;

src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java

@@ -13,6 +13,8 @@
 import com.tterrag.registrate.fabric.EnvExecutor;
 
 import dev.engine_room.flywheel.lib.visualization.VisualizationHelper;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java

@@ -25,7 +25,6 @@
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
-import net.minecraftforge.client.model.data.ModelData;
 
 public class ContraptionRenderInfo {
 	public static final SuperByteBufferCache.Compartment<Pair<Contraption, RenderType>> CONTRAPTION = new SuperByteBufferCache.Compartment<>();

src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfoManager.java

@@ -3,17 +3,13 @@
 import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.utility.WorldAttached;
 
-import dev.engine_room.flywheel.api.event.ReloadLevelRendererEvent;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
-@EventBusSubscriber(Dist.CLIENT)
 public class ContraptionRenderInfoManager {
 	static final WorldAttached<ContraptionRenderInfoManager> MANAGERS = new WorldAttached<>(ContraptionRenderInfoManager::new);
 
@@ -38,8 +34,7 @@ public static void resetAll() {
 		MANAGERS.empty(ContraptionRenderInfoManager::delete);
 	}
 
-	@SubscribeEvent
-	public static void onReloadLevelRenderer(ReloadLevelRendererEvent event) {
+	public static void onReloadLevelRenderer(ClientLevel level) {
 		resetAll();
 	}
 

src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java

@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import dev.engine_room.flywheel.lib.model.baked.FabricMultiBlockModelBuilder;
+
 import org.apache.commons.lang3.tuple.MutablePair;
 
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -28,7 +30,6 @@
 import dev.engine_room.flywheel.api.visualization.VisualizerRegistry;
 import dev.engine_room.flywheel.lib.instance.InstanceTypes;
 import dev.engine_room.flywheel.lib.instance.TransformedInstance;
-import dev.engine_room.flywheel.lib.model.baked.ForgeMultiBlockModelBuilder;
 import dev.engine_room.flywheel.lib.task.ForEachPlan;
 import dev.engine_room.flywheel.lib.task.NestedPlan;
 import dev.engine_room.flywheel.lib.task.PlanMap;
@@ -45,7 +46,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
-import net.minecraftforge.client.model.data.ModelData;
 
 public class ContraptionVisual<E extends AbstractContraptionEntity> extends AbstractEntityVisual<E> implements DynamicVisual, TickableVisual, LightUpdatedVisual, ShaderLightVisual {
 	protected static final int LIGHT_PADDING = 1;
@@ -85,7 +85,7 @@ public BlockState getBlockState(BlockPos pos) {
 			}
 		};
 
-		model = new ForgeMultiBlockModelBuilder(modelWorld, blocks.positions())
+		model = new FabricMultiBlockModelBuilder(modelWorld, blocks.positions())
 				.modelDataLookup(pos -> contraption.modelData.getOrDefault(pos, ModelData.EMPTY))
 				.build();
 

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

@@ -16,7 +16,7 @@
 
 import io.github.fabricators_of_create.porting_lib.transfer.item.ItemHandlerHelper;
 import io.github.fabricators_of_create.porting_lib.util.NBTSerializer;
-import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity;
+import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
@@ -28,7 +28,7 @@
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 
 public class CopycatBlockEntity extends SmartBlockEntity
-	implements ISpecialBlockEntityItemRequirement, ITransformableBlockEntity, IPartialSafeNBT, RenderAttachmentBlockEntity {
+	implements ISpecialBlockEntityItemRequirement, ITransformableBlockEntity, IPartialSafeNBT, RenderDataBlockEntity {
 
 	private BlockState material;
 	private ItemStack consumedItem;
@@ -186,7 +186,7 @@ protected void write(CompoundTag tag, ItemStack stack, BlockState material) {
 	}
 
 	@Override
-	public BlockState getRenderAttachmentData() {
+	public BlockState getRenderData() {
 		return material;
 	}
 

src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlockEntity.java

@@ -3,6 +3,8 @@
 import com.simibubi.create.AllPartialModels;
 
 import dev.engine_room.flywheel.lib.model.baked.PartialModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java

@@ -6,6 +6,8 @@
 import com.simibubi.create.foundation.utility.AngleHelper;
 
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;

src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java

@@ -1,9 +1,5 @@
 package com.simibubi.create.content.equipment.symmetryWand;
 
-import java.util.Random;
-
-import com.jozufozu.flywheel.fabric.model.DefaultLayerFilteringBakedModel;
-
 import org.joml.Vector3f;
 
 import com.mojang.blaze3d.vertex.PoseStack;

src/main/java/com/simibubi/create/content/fluids/PipeAttachmentBlockEntity.java

@@ -1,18 +1,19 @@
 package com.simibubi.create.content.fluids;
 
+import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity;
+
 import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
-import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 
 /**
  * Fabric: Implement this on any BlockEntity that uses {@link PipeAttachmentModel} and call {@link #getAttachments(BlockEntity)}
  */
-public interface PipeAttachmentBlockEntity extends RenderAttachmentBlockEntity {
+public interface PipeAttachmentBlockEntity extends RenderDataBlockEntity {
 	@Nullable
 	static AttachmentTypes[] getAttachments(BlockEntity be) {
 		FluidTransportBehaviour behavior = BlockEntityBehaviour.get(be, FluidTransportBehaviour.TYPE);

src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockEntity.java

@@ -47,7 +47,7 @@ private boolean canHaveBracket(BlockState state) {
 
 	@Override
 	@Nullable
-	public Object getRenderAttachmentData() {
+	public Object getRenderData() {
 		return PipeAttachmentBlockEntity.getAttachments(this);
 	}
 

src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlockEntity.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.content.fluids.FluidPropagator;
 import com.simibubi.create.content.fluids.PipeAttachmentBlockEntity;
@@ -14,6 +16,7 @@
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
@@ -46,7 +49,7 @@ private void onFilterChanged(ItemStack newFilter) {
 
 	@Override
 	@Nullable
-	public Object getRenderAttachmentData() {
+	public Object getRenderData() {
 		return PipeAttachmentBlockEntity.getAttachments(this);
 	}
 

src/main/java/com/simibubi/create/content/fluids/pipes/StraightPipeBlockEntity.java

@@ -34,7 +34,7 @@ public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
 
 	@Override
 	@Nullable
-	public Object getRenderAttachmentData() {
+	public Object getRenderData() {
 		return PipeAttachmentBlockEntity.getAttachments(this);
 	}
 

src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlockEntity.java

@@ -87,7 +87,7 @@ public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
 
 	@Override
 	@Nullable
-	public Object getRenderAttachmentData() {
+	public Object getRenderData() {
 		return PipeAttachmentBlockEntity.getAttachments(this);
 	}
 

src/main/java/com/simibubi/create/content/fluids/pump/PumpBlockEntity.java

@@ -335,7 +335,7 @@ public boolean isPullingOnSide(boolean front) {
 
 	@Override
 	@Nullable
-	public Object getRenderAttachmentData() {
+	public Object getRenderData() {
 		return PipeAttachmentBlockEntity.getAttachments(this);
 	}
 

src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java

@@ -28,6 +28,10 @@
 import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import dev.engine_room.flywheel.lib.visualization.VisualizationHelper;
+import io.github.fabricators_of_create.porting_lib.block.CustomRenderBoundingBoxBlockEntity;
+import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;