ton of trivial fixes

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

@@ -270,6 +270,8 @@
 import com.tterrag.registrate.util.DataIngredient;
 import com.tterrag.registrate.util.entry.BlockEntry;
 
+import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel;
+import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile;
 import me.alphamode.forgetags.Tags;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.Direction.Axis;
@@ -306,12 +308,10 @@
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
-import net.minecraftforge.client.model.generators.ConfiguredModel;
-import net.minecraftforge.client.model.generators.ModelFile;
 
 public class AllBlocks {
 
-	static { REGISTRATE.useCreativeTab(AllCreativeModeTabs.MAIN_TAB); }
+	static { REGISTRATE.useCreativeTab(AllCreativeModeTabs.MAIN_TAB.key()); }
 
 	// Schematics
 
@@ -1551,6 +1551,7 @@ public class AllBlocks {
 		.properties(p -> p.mapColor(MapColor.METAL)
 			.strength(0.8F)
 			.sound(SoundType.METAL)
+			.pushReaction(PushReaction.BLOCK) // fabric: moved from TrackBLock
 			.noOcclusion())
 		.addLayer(() -> RenderType::cutoutMipped)
 		.transform(pickaxeOnly())

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

@@ -7,6 +7,8 @@
 
 import com.simibubi.create.foundation.utility.Lang;
 
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -22,7 +24,7 @@
 
 public class AllTags {
 	public static <T> TagKey<T> optionalTag(Registry<T> registry,
-		ResourceLocation id) {
+											ResourceLocation id) {
 		return TagKey.create(registry.key(), id);
 	}
 
@@ -31,15 +33,15 @@ public static <T> TagKey<T> forgeTag(Registry<T> registry, String path) {
 	}
 
 	public static TagKey<Block> forgeBlockTag(String path) {
-		return forgeTag(Registry.BLOCK, path);
+		return forgeTag(BuiltInRegistries.BLOCK, path);
 	}
 
 	public static TagKey<Item> forgeItemTag(String path) {
-		return forgeTag(Registry.ITEM, path);
+		return forgeTag(BuiltInRegistries.ITEM, path);
 	}
 
 	public static TagKey<Fluid> forgeFluidTag(String path) {
-		return forgeTag(Registry.FLUID, path);
+		return forgeTag(BuiltInRegistries.FLUID, path);
 	}
 
 	public enum NameSpace {
@@ -117,7 +119,7 @@ public enum AllBlockTags {
 
 		AllBlockTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) {
 			ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path);
-			tag = optionalTag(Registry.BLOCK, id);
+			tag = optionalTag(BuiltInRegistries.BLOCK, id);
 			this.alwaysDatagen = alwaysDatagen;
 		}
 
@@ -188,7 +190,7 @@ public enum AllItemTags {
 
 		AllItemTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) {
 			ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path);
-			tag = optionalTag(Registry.ITEM, id);
+			tag = optionalTag(BuiltInRegistries.ITEM, id);
 
 			this.alwaysDatagen = alwaysDatagen;
 		}
@@ -239,7 +241,7 @@ public enum AllFluidTags {
 
 		AllFluidTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) {
 			ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path);
-			tag = optionalTag(Registry.FLUID, id);
+			tag = optionalTag(BuiltInRegistries.FLUID, id);
 			this.alwaysDatagen = alwaysDatagen;
 		}
 
@@ -284,7 +286,7 @@ public enum AllEntityTags {
 		AllEntityTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) {
 			ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path);
 			if (optional) {
-				tag = optionalTag(Registry.ENTITY_TYPE, id);
+				tag = optionalTag(BuiltInRegistries.ENTITY_TYPE, id);
 			} else {
 				tag = TagKey.create(Registries.ENTITY_TYPE, id);
 			}

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

@@ -13,7 +13,7 @@
 import dev.emi.emi.api.EmiDragDropHandler;
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;
-import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractContainerScreenAccessor;
+import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractContainerScreenAccessor;
 import io.github.fabricators_of_create.porting_lib.transfer.item.ItemHandlerHelper;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.client.renderer.Rect2i;

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

@@ -10,8 +10,7 @@
 
 import com.simibubi.create.foundation.utility.AdventureUtil;
 
-import io.github.fabricators_of_create.porting_lib.entity.RemovalFromWorldListener;
-
+import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.EntityAccessor;
 import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
 
 import org.apache.commons.lang3.mutable.MutableInt;
@@ -44,7 +43,6 @@
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 import io.github.fabricators_of_create.porting_lib.entity.ExtraSpawnDataEntity;
-import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.EntityAccessor;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -58,6 +56,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
@@ -85,7 +84,7 @@
 
 import org.jetbrains.annotations.Nullable;
 
-public abstract class AbstractContraptionEntity extends Entity implements ExtraSpawnDataEntity, RemovalFromWorldListener {
+public abstract class AbstractContraptionEntity extends Entity implements ExtraSpawnDataEntity {
 
 	private static final EntityDataAccessor<Boolean> STALLED =
 		SynchedEntityData.defineId(AbstractContraptionEntity.class, EntityDataSerializers.BOOLEAN);
@@ -599,11 +598,6 @@ protected void defineSynchedData() {
 		this.entityData.define(CONTROLLED_BY, Optional.empty());
 	}
 
-	@Override
-	public Packet<ClientGamePacketListener> getAddEntityPacket() {
-		return ExtraSpawnDataEntity.createExtraDataSpawnPacket(this, new ClientboundAddEntityPacket(this, getId()));
-	}
-
 	@Override
 	public void writeSpawnData(FriendlyByteBuf buffer) {
 		CompoundTag compound = new CompoundTag();
@@ -722,11 +716,6 @@ protected void onBelowWorld() {
 		super.onBelowWorld();
 	}
 
-	@Override
-	public void onRemovedFromWorld() {
-//		super.onRemovedFromWorld();
-	}
-
 	@Override
 	protected void doWaterSplashEffect() {}
 

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

@@ -21,6 +21,8 @@
 
 import javax.annotation.Nullable;
 
+import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.HashMapPaletteAccessor;
+
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -82,7 +84,6 @@
 import com.simibubi.create.foundation.utility.UniqueLinkedList;
 import com.simibubi.create.infrastructure.config.AllConfigs;
 
-import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.HashMapPaletteAccessor;
 import io.github.fabricators_of_create.porting_lib.util.FluidStack;
 import io.github.fabricators_of_create.porting_lib.util.StickinessUtil;
 import net.fabricmc.api.EnvType;

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

@@ -11,6 +11,8 @@
 
 import com.simibubi.create.AllDamageTypes;
 
+import com.simibubi.create.foundation.mixin.fabric.ServerGamePacketListenerImplAccessor;
+
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.mutable.MutableFloat;
 import org.apache.commons.lang3.mutable.MutableObject;
@@ -37,7 +39,6 @@
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.infrastructure.config.AllConfigs;
 
-import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.ServerGamePacketListenerImplAccessor;
 import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -119,7 +120,7 @@ static void collideEntities(AbstractContraptionEntity contraptionEntity) {
 			entity.getSelfAndPassengers()
 				.forEach(e -> {
 					if (e instanceof ServerPlayer)
-						((ServerGamePacketListenerImplAccessor) ((ServerPlayer) e).connection).port_lib$setAboveGroundTickCount(0);
+						((ServerGamePacketListenerImplAccessor) ((ServerPlayer) e).connection).create$setAboveGroundTickCount(0);
 				});
 			if (playerType == PlayerType.SERVER)
 				continue;
@@ -206,7 +207,7 @@ static void collideEntities(AbstractContraptionEntity contraptionEntity) {
 					Vec3 collisionPosition = intersect.getCollisionPosition();
 
 					if (!isTemporal) {
-						Vec3 separation = intersect.asSeparationVec(entity.maxUpStep);
+						Vec3 separation = intersect.asSeparationVec(entity.maxUpStep());
 						if (separation != null && !separation.equals(Vec3.ZERO)) {
 							collisionResponse.setValue(currentResponse.add(separation));
 							timeOfImpact = 0;
@@ -620,12 +621,12 @@ static Vec3 collide(Vec3 p_20273_, Entity e) {
 		boolean flag1 = p_20273_.y != vec3.y;
 		boolean flag2 = p_20273_.z != vec3.z;
 		boolean flag3 = flag1 && p_20273_.y < 0.0D;
-		if (e.maxUpStep > 0.0F && flag3 && (flag || flag2)) {
-			Vec3 vec31 = collideBoundingBox(e, new Vec3(p_20273_.x, e.maxUpStep, p_20273_.z), aabb,
+		if (e.maxUpStep() > 0.0F && flag3 && (flag || flag2)) {
+			Vec3 vec31 = collideBoundingBox(e, new Vec3(p_20273_.x, e.maxUpStep(), p_20273_.z), aabb,
 				e.level(), list);
-			Vec3 vec32 = collideBoundingBox(e, new Vec3(0.0D, e.maxUpStep, 0.0D),
+			Vec3 vec32 = collideBoundingBox(e, new Vec3(0.0D, e.maxUpStep(), 0.0D),
 				aabb.expandTowards(p_20273_.x, 0.0D, p_20273_.z), e.level(), list);
-			if (vec32.y < (double) e.maxUpStep) {
+			if (vec32.y < (double) e.maxUpStep()) {
 				Vec3 vec33 =
 					collideBoundingBox(e, new Vec3(p_20273_.x, 0.0D, p_20273_.z), aabb.move(vec32), e.level(), list)
 						.add(vec32);

src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java

@@ -2,6 +2,8 @@
 
 import javax.annotation.Nullable;
 
+import io.github.fabricators_of_create.porting_lib.common.util.PlantUtil;
+
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
 import com.jozufozu.flywheel.api.MaterialManager;
@@ -16,7 +18,6 @@
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.infrastructure.config.AllConfigs;
 
-import io.github.fabricators_of_create.porting_lib.util.PlantUtil;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.BlockTags;

src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java

@@ -10,12 +10,10 @@
 import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.placement.PoleHelper;
 
-import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.DamageSourceAccessor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.BlockItem;

src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java

@@ -11,7 +11,6 @@
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.infrastructure.config.AllConfigs;
-import io.github.fabricators_of_create.porting_lib.block.CustomPathNodeTypeBlock;
 import io.github.fabricators_of_create.porting_lib.util.TagUtil;
 import net.fabricmc.fabric.api.registry.LandPathNodeTypesRegistry;
 import net.minecraft.MethodsReturnNonnullByDefault;

src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java

@@ -17,7 +17,7 @@
 import com.simibubi.create.foundation.utility.WorldAttached;
 import com.simibubi.create.foundation.utility.fabric.AbstractMinecartExtensions;
 
-import io.github.fabricators_of_create.porting_lib.extensions.INBTSerializable;
+import io.github.fabricators_of_create.porting_lib.core.util.INBTSerializable;
 import io.github.fabricators_of_create.porting_lib.util.LazyOptional;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;

src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java

@@ -8,7 +8,7 @@
 
 import javax.annotation.Nullable;
 
-import io.github.fabricators_of_create.porting_lib.extensions.INBTSerializable;
+import io.github.fabricators_of_create.porting_lib.core.util.INBTSerializable;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 

src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java

@@ -5,13 +5,14 @@
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
 
+import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile;
+
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.piston.PistonBaseBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.PistonType;
-import net.minecraftforge.client.model.generators.ModelFile;
 
 public class MechanicalPistonGenerator extends SpecialBlockStateGen {
 
@@ -37,7 +38,7 @@ protected int getYRotation(BlockState state) {
 
 	@Override
 	public <T extends Block> ModelFile getModel(DataGenContext<Block, T> ctx, RegistrateBlockstateProvider prov,
-		BlockState state) {
+												BlockState state) {
 		Direction facing = state.getValue(PistonBaseBlock.FACING);
 		boolean axisAlongFirst = state.getValue(MechanicalPistonBlock.AXIS_ALONG_FIRST_COORDINATE);
 		PistonState pistonState = state.getValue(MechanicalPistonBlock.STATE);

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

@@ -20,7 +20,6 @@
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.event.BeginFrameEvent;
 import com.jozufozu.flywheel.event.RenderLayerEvent;
-import com.jozufozu.flywheel.fabric.helper.Matrix4fHelper;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.content.contraptions.Contraption;

src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java

@@ -3,7 +3,6 @@
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
-import io.github.fabricators_of_create.porting_lib.block.CustomScaffoldingBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;

src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java

@@ -6,10 +6,11 @@
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 
+import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile;
+
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.client.model.generators.ModelFile;
 
 public class BracketGenerator extends DirectionalAxisBlockStateGen {
 
@@ -27,7 +28,7 @@ public <T extends Block> String getModelPrefix(DataGenContext<Block, T> ctx, Reg
 
 	@Override
 	public <T extends Block> ModelFile getModel(DataGenContext<Block, T> ctx, RegistrateBlockstateProvider prov,
-		BlockState state) {
+												BlockState state) {
 		String type = state.getValue(BracketBlock.TYPE)
 			.getSerializedName();
 		boolean vertical = state.getValue(BracketBlock.FACING)

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

@@ -1,12 +1,10 @@
 package com.simibubi.create.content.decoration.copycat;
 
-import java.util.Random;
 import java.util.function.Supplier;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.utility.Iterate;
 
-import io.github.fabricators_of_create.porting_lib.model.CustomParticleIconModel;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
 import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView;