Recent batch of converted kotlin block code.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/GenerationsBoatEntity.java

@@ -39,9 +39,9 @@ protected void readAdditionalSaveData(CompoundTag compound) {
     }
 
     @Override
-    protected void defineSynchedData() {
-        super.defineSynchedData();
-        this.entityData.define(DATA_ID_TYPE, Type.GHOST.ordinal());
+    protected void defineSynchedData(SynchedEntityData.Builder builder) {
+        super.defineSynchedData(builder);
+        builder.define(DATA_ID_TYPE, Type.GHOST.ordinal());
     }
 
     @Override

common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/GenerationsChestBoatEntity.java

@@ -1,8 +1,10 @@
 package generations.gg.generations.core.generationscore.common.world.entity;
 
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.Containers;
 import net.minecraft.world.InteractionHand;
@@ -22,14 +24,15 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.gameevent.GameEvent;
+import net.minecraft.world.level.storage.loot.LootTable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class GenerationsChestBoatEntity extends GenerationsBoatEntity implements HasCustomInventoryScreen, ContainerEntity {
     private static final int CONTAINER_SIZE = 27;
     private NonNullList<ItemStack> itemStacks;
     @Nullable
-    private ResourceLocation lootTable;
+    private ResourceKey<LootTable> lootTable;
     private long lootTableSeed;
 
     public GenerationsChestBoatEntity(EntityType<? extends GenerationsChestBoatEntity> entityType, Level level) {
@@ -55,12 +58,12 @@ protected int getMaxPassengers() {
 
     protected void addAdditionalSaveData(CompoundTag compoundTag) {
         super.addAdditionalSaveData(compoundTag);
-        this.addChestVehicleSaveData(compoundTag);
+        this.addChestVehicleSaveData(compoundTag, this.registryAccess());
     }
 
     protected void readAdditionalSaveData(CompoundTag compoundTag) {
         super.readAdditionalSaveData(compoundTag);
-        this.readChestVehicleSaveData(compoundTag);
+        this.readChestVehicleSaveData(compoundTag, this.registryAccess());
     }
 
     public void destroy(DamageSource damageSource) {
@@ -147,13 +150,13 @@ public void unpackLootTable(@Nullable Player player) {
         this.unpackChestVehicleLootTable(player);
     }
 
-    @Nullable
-    public ResourceLocation getLootTable() {
+    public ResourceKey<LootTable> getLootTable() {
         return this.lootTable;
     }
 
-    public void setLootTable(@Nullable ResourceLocation resourceLocation) {
-        this.lootTable = resourceLocation;
+    @Override
+    public void setLootTable(@Nullable ResourceKey<LootTable> lootTable) {
+        this.lootTable = lootTable;
     }
 
     public long getLootTableSeed() {

common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/block/SittableEntity.java

@@ -7,9 +7,12 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.server.level.ServerEntity;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
@@ -29,6 +32,11 @@ public SittableEntity(EntityType<? extends Entity> type, Level level) {
         this.noPhysics = true;
     }
 
+    @Override
+    protected void defineSynchedData(SynchedEntityData.Builder builder) {
+
+    }
+
     private SittableEntity(Level level, BlockPos pos, double offset, float yaw) {
         this(GenerationsEntities.SEAT.get(), level);
         this.setPos(pos.getX() + 0.5, pos.getY() + offset, pos.getZ() + 0.5);
@@ -69,16 +77,17 @@ public void tick() {
 //        }
 //    }
 
-    @Override
-    protected void defineSynchedData() {}
-
     @Override
     protected void readAdditionalSaveData(@NotNull CompoundTag compound) {}
 
     @Override
     protected void addAdditionalSaveData(@NotNull CompoundTag compound) {}
 
     @Override
+    public Vec3 getPassengerRidingPosition(Entity entity) {
+        return super.getPassengerRidingPosition(entity).add(0.0, getPassengersRidingOffset(), 0.0);
+    }
+
     public double getPassengersRidingOffset()
     {
         return 0.0;
@@ -91,27 +100,27 @@ protected boolean canRide(@NotNull Entity entity)
     }
 
     // Call to mount the player to a newly created SittableEntity
-    public static InteractionResult mount(Level level, BlockPos pos, double yOffset, Player player, float direction) {
+    public static ItemInteractionResult mount(Level level, BlockPos pos, double yOffset, Player player, float direction) {
         if(level instanceof ServerLevel serverLevel) {
             List<SittableEntity> seats = level.getEntitiesOfClass(SittableEntity.class, new AABB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1.0, pos.getY() + 1.0, pos.getZ() + 1.0));
             if(seats.isEmpty()) {
                 SittableEntity seat = new SittableEntity(level, pos, yOffset, direction);
                 if(level.addFreshEntity(seat)) {
                     player.startRiding(seat);
-                    return InteractionResult.SUCCESS;
+                    return ItemInteractionResult.SUCCESS;
                 } else {
-                    return InteractionResult.FAIL;
+                    return ItemInteractionResult.FAIL;
                 }
             }
         }
 
-        return InteractionResult.PASS;
+        return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
     }
 
 
     @Override
-    public @NotNull Packet<ClientGamePacketListener> getAddEntityPacket() {
-        return NetworkManager.createAddEntityPacket(this);
+    public Packet<ClientGamePacketListener> getAddEntityPacket(ServerEntity entity) {
+        return NetworkManager.createAddEntityPacket(this, entity);
     }
 
     // Tick the key and check if the block is removed or if there are no more passengers

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/DyedGroup.java

@@ -1,16 +1,13 @@
 package generations.gg.generations.core.generationscore.common.world.level.block;
 
-import dev.architectury.registry.registries.RegistrySupplier;
-import generations.gg.generations.core.generationscore.common.world.level.block.entities.ModelProvidingBlockEntity;
-import generations.gg.generations.core.generationscore.common.world.level.block.utilityblocks.DyeableBlock;
+import net.minecraft.core.Holder;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.Block;
 
 import java.util.Map;
-import java.util.function.Supplier;
 
-public record DyedGroup<V extends DyeableBlock<T, V>, T extends ModelProvidingBlockEntity>(Map<DyeColor, RegistrySupplier<V>> block)  {
+public record DyedGroup(Map<DyeColor, Holder<Block>> block)  {
     public Block[] toArray() {
-        return block().values().stream().map(Supplier::get).map(a -> (Block) a).toArray(Block[]::new);
+        return block().values().stream().map(Holder::value).map(a -> (Block) a).toArray(Block[]::new);
     }
 }