diff --git a/build.gradle b/build.gradle index 85f7230f32..6d549ade3a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.moddev' version '2.0.9-beta' + id 'net.neoforged.moddev' version '2.0.74' } boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false'); @@ -96,6 +96,7 @@ repositories { maven { url = "https://maven.ithundxr.dev/snapshots" } // Registrate maven { url = "https://maven.blamejared.com" } // JEI, Vazkii's Mods maven { url = "https://harleyoconnor.com/maven" } // Dynamic Trees + maven { url = "https://maven.theillusivec4.top/" } // Curios API maven { url = "https://maven.squiddev.cc" } // CC: Tweaked maven { url = "https://www.cursemaven.com" } maven { url = "https://api.modrinth.com/maven" } @@ -107,7 +108,6 @@ repositories { includeGroup "mysticdrew" } } - maven { url = "https://maven.octo-studios.com/releases" } // Curios API Continuation // Mirror of maven.createmod.net if (System.getProperty("os.name").contains("Mac") && System.getenv("USER") == "ithundxr") { diff --git a/gradle.properties b/gradle.properties index cb4347b395..1b1799ecf2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,8 +36,8 @@ flywheel_version_range = [1.0.0-alpha,2.0) jei_minecraft_version = 1.21 jei_version = 19.5.0.33 curios_minecraft_version = 1.21.1 -curios_version = 9.0.15 -catnip_version = 0.8.52 +curios_version = 9.2.0 +catnip_version = 0.8.53 ponder_version = 0.8.7 catnip_and_ponder_mc_ver = 1.21.1 diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java index 80116da048..bcf7b61ed2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java @@ -19,14 +19,13 @@ import net.minecraft.world.entity.animal.Cat; import net.minecraft.world.entity.animal.Parrot; import net.minecraft.world.entity.animal.Wolf; import net.minecraft.world.entity.animal.frog.Frog; -import net.minecraft.world.entity.monster.Creeper; import net.minecraft.world.entity.monster.Skeleton; import net.minecraft.world.entity.monster.Slime; import net.minecraft.world.entity.monster.Spider; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.common.util.FakePlayer; import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; @@ -76,7 +75,7 @@ public class SeatEntity extends Entity implements IEntityWithComplexSpawn { if (entity instanceof Wolf) return 1 / 16f; if (entity instanceof Frog) - return 1 / 16f + 1.75 / 64f; + return 12 / 16f; if (entity instanceof Spider) return 1 / 8.0; if (entity instanceof PackageEntity) diff --git a/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java index e1a8b91a68..a0293a59c0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java @@ -63,7 +63,7 @@ public class BeltTunnelBlockEntity extends SmartBlockEntity { if (AllBlocks.BELT.has(be.level.getBlockState(be.worldPosition.below()))) { BlockEntity beBelow = be.level.getBlockEntity(be.worldPosition.below()); if (beBelow != null) { - IItemHandler capBelow = be.level.getCapability(Capabilities.ItemHandler.BLOCK, be.worldPosition, Direction.UP); + IItemHandler capBelow = be.level.getCapability(Capabilities.ItemHandler.BLOCK, be.worldPosition.below(), Direction.UP); if (capBelow != null) { be.cap = capBelow; } diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java index 9db33b5c79..3609f9a72c 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java @@ -17,7 +17,9 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; +import io.netty.buffer.ByteBuf; import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; import net.createmod.catnip.utility.Couple; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.Pair; @@ -33,7 +35,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.tags.BlockTags; import net.minecraft.util.Mth; @@ -52,11 +53,10 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import org.jetbrains.annotations.NotNull; - public class TrackPlacement { public record ConnectingFrom(BlockPos pos, Vec3 axis, Vec3 end, Vec3 normal) { public static Codec CODEC = RecordCodecBuilder.create(i -> i.group( @@ -66,23 +66,13 @@ public class TrackPlacement { Vec3.CODEC.fieldOf("normal").forGetter(ConnectingFrom::normal) ).apply(i, ConnectingFrom::new)); - public static StreamCodec STREAM_CODEC = new StreamCodec<>() { - public @NotNull ConnectingFrom decode(@NotNull FriendlyByteBuf buffer) { - BlockPos pos = FriendlyByteBuf.readBlockPos(buffer); - Vec3 axis = buffer.readVec3(); - Vec3 end = buffer.readVec3(); - Vec3 normal = buffer.readVec3(); - - return new ConnectingFrom(pos, axis, end, normal); - } - - public void encode(@NotNull FriendlyByteBuf buffer, ConnectingFrom connectingFrom) { - FriendlyByteBuf.writeBlockPos(buffer, connectingFrom.pos()); - buffer.writeVec3(connectingFrom.axis()); - buffer.writeVec3(connectingFrom.end()); - buffer.writeVec3(connectingFrom.normal()); - } - }; + public static StreamCodec STREAM_CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC, ConnectingFrom::pos, + CatnipStreamCodecs.VEC3, ConnectingFrom::axis, + CatnipStreamCodecs.VEC3, ConnectingFrom::end, + CatnipStreamCodecs.VEC3, ConnectingFrom::normal, + ConnectingFrom::new + ); } public static class PlacementInfo { diff --git a/src/main/resources/data/create/structure/gametest/processing/crushing_wheel_crafting.nbt b/src/main/resources/data/create/structure/gametest/processing/crushing_wheel_crafting.nbt index 532a122bf8..f5dbbe0fea 100644 Binary files a/src/main/resources/data/create/structure/gametest/processing/crushing_wheel_crafting.nbt and b/src/main/resources/data/create/structure/gametest/processing/crushing_wheel_crafting.nbt differ