From 4b0b057927caba47674c430a03c4faf76bbced74 Mon Sep 17 00:00:00 2001 From: antD97 Date: Sat, 9 Dec 2023 02:04:02 -0500 Subject: [PATCH] Updated for 1.20 - updated gradle settings for 1.20 - updated fabric.mod.josn for 1.20 - fixed compile errors that came with the update --- gradle.properties | 8 +++---- .../server/RequestCartTypePacketListener.java | 3 ++- .../mixin/AbstractMinecartEntityMixin.java | 23 +++++++++++-------- .../railtransportplus/mixin/EntityMixin.java | 2 +- .../mixin/FurnaceMinecartEntityMixin.java | 2 +- .../mixin/PlayerEntityMixin.java | 2 +- .../mixin/VehicleInventoryMixin.java | 2 +- src/main/resources/fabric.mod.json | 6 ++--- 8 files changed, 26 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index a2318be..064c4bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19.4 - yarn_mappings=1.19.4+build.2 - loader_version=0.15.0 + minecraft_version=1.20 + yarn_mappings=1.20+build.1 + loader_version=0.15.1 # Mod Properties mod_version = 1.0.0 @@ -14,4 +14,4 @@ org.gradle.parallel=true archives_base_name = rail-transport-plus # Dependencies - fabric_version=0.87.2+1.19.4 + fabric_version=0.83.0+1.20 diff --git a/src/main/java/com/antd/railtransportplus/listener/server/RequestCartTypePacketListener.java b/src/main/java/com/antd/railtransportplus/listener/server/RequestCartTypePacketListener.java index f4315e9..e3e7baf 100644 --- a/src/main/java/com/antd/railtransportplus/listener/server/RequestCartTypePacketListener.java +++ b/src/main/java/com/antd/railtransportplus/listener/server/RequestCartTypePacketListener.java @@ -13,6 +13,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import static com.antd.railtransportplus.RailTransportPlus.CART_VISUAL_STATE_PACKET_ID; @@ -28,7 +29,7 @@ public void receive( ) { // respond to request for cart visual state - final var cart = (AbstractMinecartEntity) player.getWorld().getEntity(buf.readUuid()); + final var cart = (AbstractMinecartEntity) ((ServerWorld) player.getWorld()).getEntity(buf.readUuid()); final var rtpCart = (IRtpAbstractMinecartEntity) cart; final var resBuf = PacketByteBufs.create(); diff --git a/src/main/java/com/antd/railtransportplus/mixin/AbstractMinecartEntityMixin.java b/src/main/java/com/antd/railtransportplus/mixin/AbstractMinecartEntityMixin.java index b67f710..696c4cd 100644 --- a/src/main/java/com/antd/railtransportplus/mixin/AbstractMinecartEntityMixin.java +++ b/src/main/java/com/antd/railtransportplus/mixin/AbstractMinecartEntityMixin.java @@ -96,7 +96,7 @@ public void getMaxSpeed(CallbackInfoReturnable cir) { @Inject(at = @At("HEAD"), method = "tick()V") public void tickHead(CallbackInfo ci) { - if (!this.world.isClient()) { + if (!this.getWorld().isClient()) { isTicked = false; if (prevCart != null || nextCart != null) skipMove = true; } @@ -105,7 +105,7 @@ public void tickHead(CallbackInfo ci) { @Inject(at = @At("RETURN"), method = "tick()V") public void tickReturn(CallbackInfo ci) { - if (!this.world.isClient() && (prevCart != null || nextCart != null)) { + if (!this.getWorld().isClient() && (prevCart != null || nextCart != null)) { isTicked = true; // if all carts were ticked @@ -184,7 +184,7 @@ public void tickReturn(CallbackInfo ci) { // damage colliding entities if (vel > 10) { - final var collidingEntities = cart.world + final var collidingEntities = cart.getWorld() .getOtherEntities( this, cart.getBoundingBox().expand(0.05).stretch(this.getVelocity()), @@ -198,7 +198,10 @@ public void tickReturn(CallbackInfo ci) { for (final var e : collidingEntities) { e.takeKnockback(vel * 0.1, cart.getX() - e.getX(), cart.getZ() - e.getZ()); - e.damage(new DamageSource(world.getRegistryManager().get(RegistryKeys.DAMAGE_TYPE).entryOf(RailTransportPlus.TRAIN_DAMAGE)), (float) damage); + e.damage(new DamageSource(e.getWorld().getRegistryManager().get(RegistryKeys.DAMAGE_TYPE) + .entryOf(RailTransportPlus.TRAIN_DAMAGE)), + (float) damage + ); } } } @@ -247,7 +250,7 @@ public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) { @Inject(at = @At("RETURN"), method = "readCustomDataFromNbt(Lnet/minecraft/nbt/NbtCompound;)V") public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) { final var thisCart = (AbstractMinecartEntity) (Object) this; - final var world = (ServerWorld) thisCart.world; + final var world = (ServerWorld) thisCart.getWorld(); if (nbt.containsUuid("nextCart")) { final var loadedUuid = nbt.getUuid("nextCart"); @@ -344,7 +347,7 @@ public void unlinkCart(AbstractMinecartEntity cart) { ((IRtpAbstractMinecartEntity) unlinkedCart).setPrevCart(null); // item drop - if (this.world.getGameRules().get(GameRules.DO_ENTITY_DROPS).get()) this.dropItem(Items.CHAIN); + if (this.getWorld().getGameRules().get(GameRules.DO_ENTITY_DROPS).get()) this.dropItem(Items.CHAIN); // sound ((AbstractMinecartEntity) (Object) this).playSound(SoundEvents.BLOCK_CHAIN_PLACE, 1.0F, 1.0F); @@ -356,7 +359,7 @@ public void unlinkCart(AbstractMinecartEntity cart) { ((IRtpAbstractMinecartEntity) unlinkedCart).setNextCart(null); // item drop - if (this.world.getGameRules().get(GameRules.DO_ENTITY_DROPS).get()) this.dropItem(Items.CHAIN); + if (this.getWorld().getGameRules().get(GameRules.DO_ENTITY_DROPS).get()) this.dropItem(Items.CHAIN); // sound ((AbstractMinecartEntity) (Object) this).playSound(SoundEvents.BLOCK_CHAIN_PLACE, 1.0F, 1.0F); @@ -491,7 +494,7 @@ public void updateVisualState() { // send update to clients if (oldVisualState != this.visualState) { - for (var player : ((ServerWorld) this.world).getPlayers()) { + for (var player : ((ServerWorld) this.getWorld()).getPlayers()) { final var buf = PacketByteBufs.create(); buf.writeUuid(this.getUuid()); @@ -507,10 +510,10 @@ public void move(boolean isTrailing) { var i = MathHelper.floor(this.getX()); var j = MathHelper.floor(this.getY()); var k = MathHelper.floor(this.getZ()); - if (this.world.getBlockState(new BlockPos(i, j - 1, k)).isIn(BlockTags.RAILS)) --j; + if (this.getWorld().getBlockState(new BlockPos(i, j - 1, k)).isIn(BlockTags.RAILS)) --j; final var blockPos = new BlockPos(i, j, k); - final var blockState = this.world.getBlockState(blockPos); + final var blockState = this.getWorld().getBlockState(blockPos); if (AbstractRailBlock.isRail(blockState)) { if (isTrailing) { // trailing carts ignore powered rails diff --git a/src/main/java/com/antd/railtransportplus/mixin/EntityMixin.java b/src/main/java/com/antd/railtransportplus/mixin/EntityMixin.java index 2b52339..19617d3 100644 --- a/src/main/java/com/antd/railtransportplus/mixin/EntityMixin.java +++ b/src/main/java/com/antd/railtransportplus/mixin/EntityMixin.java @@ -19,7 +19,7 @@ public abstract class EntityMixin { public void remove(Entity.RemovalReason reason, CallbackInfo ci) { final var thisEntity = (Entity) (Object) this; - if (!thisEntity.world.isClient() && this instanceof final IRtpAbstractMinecartEntity thisCart) { + if (!thisEntity.getWorld().isClient() && this instanceof final IRtpAbstractMinecartEntity thisCart) { thisCart.unlinkBothCarts(); } } diff --git a/src/main/java/com/antd/railtransportplus/mixin/FurnaceMinecartEntityMixin.java b/src/main/java/com/antd/railtransportplus/mixin/FurnaceMinecartEntityMixin.java index 05ad178..47d0c4d 100644 --- a/src/main/java/com/antd/railtransportplus/mixin/FurnaceMinecartEntityMixin.java +++ b/src/main/java/com/antd/railtransportplus/mixin/FurnaceMinecartEntityMixin.java @@ -48,7 +48,7 @@ protected FurnaceMinecartEntityMixin(EntityType entityType, World world) { @Inject(at = @At("RETURN"), method = "tick()V") public void tick(CallbackInfo ci) { - if (!this.world.isClient()) { + if (!this.getWorld().isClient()) { // try refueling from chest cart if (this.fuel <= 0) { diff --git a/src/main/java/com/antd/railtransportplus/mixin/PlayerEntityMixin.java b/src/main/java/com/antd/railtransportplus/mixin/PlayerEntityMixin.java index 0891223..a42054b 100644 --- a/src/main/java/com/antd/railtransportplus/mixin/PlayerEntityMixin.java +++ b/src/main/java/com/antd/railtransportplus/mixin/PlayerEntityMixin.java @@ -35,7 +35,7 @@ protected PlayerEntityMixin(EntityType entityType, World @Inject(at = @At("HEAD"), method = "tick()V") public void tick(CallbackInfo ci) { - if (!this.world.isClient()) { + if (!this.getWorld().isClient()) { final var thisPlayer = (ServerPlayerEntity) (Object) this; // linking cart message diff --git a/src/main/java/com/antd/railtransportplus/mixin/VehicleInventoryMixin.java b/src/main/java/com/antd/railtransportplus/mixin/VehicleInventoryMixin.java index cafa7e8..7b88cd0 100644 --- a/src/main/java/com/antd/railtransportplus/mixin/VehicleInventoryMixin.java +++ b/src/main/java/com/antd/railtransportplus/mixin/VehicleInventoryMixin.java @@ -16,7 +16,7 @@ public interface VehicleInventoryMixin extends IRtpVehicleInventory { @Inject(at = @At("HEAD"), method = "open", cancellable = true) default void open(PlayerEntity player, CallbackInfoReturnable cir) { - if (!player.world.isClient) { + if (!player.getWorld().isClient) { final var rtpStorageCart = ((IRtpStorageMinecartEntity) this); if (rtpStorageCart.getSkipNextOpen()) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 101f454..71a3355 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,9 +31,9 @@ ], "depends": { - "fabricloader": ">=0.14.11", - "fabric-api": "*", - "minecraft": "~1.19.2", + "fabricloader": ">=0.15.1", + "fabric-api": ">=0.83.0", + "minecraft": "1.20", "java": ">=17" } }