Skip to content

Commit 72a7f43

Browse files
PatboxPatbox
committed
Update to 1.21.3
1 parent f13ebdb commit 72a7f43

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+198
-253
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up JDK 17
2020
uses: actions/setup-java@v2
2121
with:
22-
java-version: 17
22+
java-version: 21
2323
distribution: 'temurin'
2424

2525
- name: Grant execute permission for gradlew
@@ -28,7 +28,7 @@ jobs:
2828
- name: Build with Gradle
2929
run: ./gradlew build
3030

31-
- uses: actions/upload-artifact@v2
31+
- uses: actions/upload-artifact@v4
3232
with:
3333
name: Artifacts
3434
path: ./build/libs/

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up JDK 17
2424
uses: actions/setup-java@v2
2525
with:
26-
java-version: 17
26+
java-version: 21
2727
distribution: 'temurin'
2828

2929
- name: Grant execute permission for gradlew
@@ -33,7 +33,7 @@ jobs:
3333
run: ./gradlew build
3434

3535
- name: Upload GitHub release
36-
uses: AButler/upload-release-assets@v2.0
36+
uses: AButler/upload-release-assets@v3.0
3737
with:
3838
files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
3939
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎build.gradle

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.4.+'
3-
id 'org.quiltmc.quilt-mappings-on-loom' version '4.2.3'
2+
id 'fabric-loom' version '1.7.+'
43
id 'java-library'
54
id 'maven-publish'
65
id 'org.quiltmc.gradle.licenser' version '1.1.+'
@@ -11,7 +10,7 @@ version = "${project.mod_version}+${getMCVersionString()}"
1110
archivesBaseName = project.archives_base_name
1211

1312
// This field defines the Java version your mod target.
14-
def targetJavaVersion = 17
13+
def targetJavaVersion = 21
1514

1615
boolean isMCVersionNonRelease() {
1716
def mc = libs.versions.minecraft.get()
@@ -53,13 +52,8 @@ dependencies {
5352
minecraft libs.minecraft
5453
modImplementation libs.fabric.loader
5554

56-
/*mappings(loom.layered {
57-
addLayer(quiltMappings.mappings(libs.minecraft.mappings.get().toString() + ":intermediary-v2"))
58-
})*/
59-
60-
mappings "org.quiltmc:quilt-mappings:1.20.4+build.1:intermediary-v2"
61-
62-
55+
// mappings libs.minecraft.mappings
56+
mappings "net.fabricmc:yarn:1.21.3+build.1:v2"
6357
// Fabric API.
6458
modImplementation libs.fabric.api
6559

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
org.gradle.jvmargs=-Xmx1G
33

44
# Mod Properties
5-
mod_version = 1.7.6
5+
mod_version = 1.7.7
66
maven_group = dev.lambdaurora
77
archives_base_name = quakecraft

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎settings.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ pluginManagement {
1515
dependencyResolutionManagement {
1616
versionCatalogs {
1717
libs {
18-
def mc = "1.20.4"
18+
def mc = "1.21.3"
1919
def mappings = 1
2020

2121
version("minecraft", mc)
2222
version("mappings", "${mc}+build.${mappings}")
2323

2424
library("minecraft", "com.mojang", "minecraft").versionRef("minecraft")
25-
library("minecraft-mappings", "org.quiltmc", "quilt-mappings").versionRef("mappings")
26-
library("fabric-loader", "net.fabricmc:fabric-loader:0.14.6")
25+
library("minecraft-mappings", "net.fabricmc", "yarn").versionRef("mappings")
26+
library("fabric-loader", "net.fabricmc:fabric-loader:0.16.9")
2727

28-
library("fabric-api", "net.fabricmc.fabric-api:fabric-api:0.91.1+${mc}")
29-
library("nucleoid-plasmid", "xyz.nucleoid:plasmid:0.5.102-SNAPSHOT+${mc}")
28+
library("fabric-api", "net.fabricmc.fabric-api:fabric-api:0.106.1+${mc}")
29+
library("nucleoid-plasmid", "xyz.nucleoid:plasmid:0.6.0-SNAPSHOT+${mc}")
3030
}
3131
}
3232
}

‎src/main/java/dev/lambdaurora/quakecraft/Quakecraft.java

+12-17
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
import dev.lambdaurora.quakecraft.game.QuakecraftLogic;
2222
import dev.lambdaurora.quakecraft.game.QuakecraftWaiting;
2323
import dev.lambdaurora.quakecraft.mixin.FireworkRocketEntityAccessor;
24+
import it.unimi.dsi.fastutil.ints.IntList;
2425
import net.fabricmc.api.ModInitializer;
26+
import net.minecraft.component.DataComponentTypes;
27+
import net.minecraft.component.type.FireworkExplosionComponent;
2528
import net.minecraft.entity.attribute.EntityAttributes;
2629
import net.minecraft.entity.projectile.FireworkRocketEntity;
2730
import net.minecraft.item.ItemStack;
@@ -36,7 +39,7 @@
3639
import org.apache.logging.log4j.Logger;
3740
import org.jetbrains.annotations.NotNull;
3841
import org.jetbrains.annotations.Nullable;
39-
import xyz.nucleoid.plasmid.game.GameType;
42+
import xyz.nucleoid.plasmid.api.game.GameType;
4043

4144
import java.util.ArrayList;
4245
import java.util.List;
@@ -62,7 +65,7 @@ public void onInitialize() {
6265

6366
QuakecraftRegistry.init();
6467

65-
GameType.register(new Identifier(NAMESPACE, "quakecraft"),
68+
GameType.register(Identifier.of(NAMESPACE, "quakecraft"),
6669
QuakecraftConfig.CODEC, QuakecraftWaiting::open);
6770
}
6871

@@ -104,7 +107,7 @@ public static Quakecraft get() {
104107
}
105108

106109
public static Identifier id(@NotNull String name) {
107-
return new Identifier(NAMESPACE, name);
110+
return Identifier.of(NAMESPACE, name);
108111
}
109112

110113
/**
@@ -114,9 +117,9 @@ public static Identifier id(@NotNull String name) {
114117
* @since 1.1.0
115118
*/
116119
public static void applySpeed(ServerPlayerEntity player) {
117-
var movementSpeedAttribute = player.getAttributes().createIfAbsent(EntityAttributes.GENERIC_MOVEMENT_SPEED);
120+
var movementSpeedAttribute = player.getAttributes().getCustomInstance(EntityAttributes.MOVEMENT_SPEED);
118121
if (movementSpeedAttribute != null) {
119-
movementSpeedAttribute.removeModifier(QuakecraftConstants.PLAYER_MOVEMENT_SPEED_MODIFIER.getId());
122+
movementSpeedAttribute.removeModifier(QuakecraftConstants.PLAYER_MOVEMENT_SPEED_MODIFIER.id());
120123
movementSpeedAttribute.addTemporaryModifier(QuakecraftConstants.PLAYER_MOVEMENT_SPEED_MODIFIER);
121124
}
122125
}
@@ -128,9 +131,9 @@ public static void applySpeed(ServerPlayerEntity player) {
128131
* @since 1.1.0
129132
*/
130133
public static void removeSpeed(ServerPlayerEntity player) {
131-
var movementSpeedAttribute = player.getAttributes().createIfAbsent(EntityAttributes.GENERIC_MOVEMENT_SPEED);
134+
var movementSpeedAttribute = player.getAttributes().getCustomInstance(EntityAttributes.MOVEMENT_SPEED);
132135
if (movementSpeedAttribute != null) {
133-
movementSpeedAttribute.removeModifier(QuakecraftConstants.PLAYER_MOVEMENT_SPEED_MODIFIER.getId());
136+
movementSpeedAttribute.removeModifier(QuakecraftConstants.PLAYER_MOVEMENT_SPEED_MODIFIER.id());
134137
}
135138
}
136139

@@ -141,16 +144,8 @@ public static Direction getDirectionByName(@Nullable String name) {
141144
public static void spawnFirework(ServerWorld world, double x, double y, double z, int[] colors, boolean silent, int lifetime) {
142145
var fireworkStack = new ItemStack(Items.FIREWORK_ROCKET);
143146

144-
var tag = fireworkStack.getOrCreateSubNbt("Fireworks");
145-
tag.putByte("Flight", (byte) 0);
146-
147-
var explosions = new NbtList();
148-
var explosion = new NbtCompound();
149-
explosion.putByte("Type", (byte) 0);
150-
explosion.putIntArray("Colors", colors);
151-
explosions.add(explosion);
152-
tag.put("Explosions", explosions);
153-
147+
fireworkStack.set(DataComponentTypes.FIREWORK_EXPLOSION, new FireworkExplosionComponent(FireworkExplosionComponent.Type.SMALL_BALL,
148+
IntList.of(colors), IntList.of(), false, false));
154149
var firework = new FireworkRocketEntity(world, x, y, z, fireworkStack);
155150
firework.setSilent(silent);
156151
if (lifetime >= 0)

‎src/main/java/dev/lambdaurora/quakecraft/QuakecraftConstants.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import net.minecraft.entity.Entity;
2121
import net.minecraft.entity.attribute.EntityAttributeModifier;
2222
import net.minecraft.server.network.ServerPlayerEntity;
23+
import net.minecraft.util.Identifier;
2324
import net.minecraft.world.GameMode;
2425

2526
import java.util.UUID;
@@ -44,8 +45,8 @@ public class QuakecraftConstants {
4445
public static final Predicate<Entity> PLAYER_PREDICATE = entity -> entity instanceof ServerPlayerEntity
4546
&& ((ServerPlayerEntity) entity).interactionManager.getGameMode() != GameMode.SPECTATOR;
4647

47-
public static final EntityAttributeModifier PLAYER_MOVEMENT_SPEED_MODIFIER = new EntityAttributeModifier(UUID.fromString("91AEAA56-376B-4498-935B-2F7F68070635"),
48-
"quakecraft.movement.speed",
48+
public static final EntityAttributeModifier PLAYER_MOVEMENT_SPEED_MODIFIER = new EntityAttributeModifier(
49+
Identifier.of("quakecraft", "movement.speed"),
4950
2 * 0.20000000298023224D,
50-
EntityAttributeModifier.Operation.MULTIPLY_TOTAL);
51+
EntityAttributeModifier.Operation.ADD_MULTIPLIED_TOTAL);
5152
}

‎src/main/java/dev/lambdaurora/quakecraft/QuakecraftRegistry.java

+20-15
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@
2222
import dev.lambdaurora.quakecraft.block.entity.TeamBarrierBlockEntity;
2323
import eu.pb4.polymer.core.api.block.PolymerBlockUtils;
2424
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
25+
import net.minecraft.block.AbstractBlock;
2526
import net.minecraft.block.Block;
2627
import net.minecraft.block.Blocks;
2728
import net.minecraft.block.entity.BlockEntityType;
2829
import net.minecraft.registry.Registries;
2930
import net.minecraft.registry.Registry;
31+
import net.minecraft.registry.RegistryKey;
32+
import net.minecraft.registry.RegistryKeys;
33+
34+
import java.util.function.Function;
3035

3136
/**
3237
* The Quakecraft registry.
@@ -38,28 +43,28 @@
3843
* @since 1.6.1
3944
*/
4045
public class QuakecraftRegistry {
41-
public static LaunchPadBlock STONE_LAUNCHPAD_BLOCK = register("stone_launchpad", new LaunchPadBlock(Blocks.STONE_PRESSURE_PLATE));
42-
public static LaunchPadBlock OAK_LAUNCHPAD_BLOCK = register("oak_launchpad", new LaunchPadBlock(Blocks.OAK_PRESSURE_PLATE));
43-
public static LaunchPadBlock SPRUCE_LAUNCHPAD_BLOCK = register("spruce_launchpad", new LaunchPadBlock(Blocks.SPRUCE_PRESSURE_PLATE));
44-
public static LaunchPadBlock BIRCH_LAUNCHPAD_BLOCK = register("birch_launchpad", new LaunchPadBlock(Blocks.BIRCH_PRESSURE_PLATE));
45-
public static LaunchPadBlock JUNGLE_LAUNCHPAD_BLOCK = register("jungle_launchpad", new LaunchPadBlock(Blocks.JUNGLE_PRESSURE_PLATE));
46-
public static LaunchPadBlock ACACIA_LAUNCHPAD_BLOCK = register("acacia_launchpad", new LaunchPadBlock(Blocks.ACACIA_PRESSURE_PLATE));
47-
public static LaunchPadBlock DARK_OAK_LAUNCHPAD_BLOCK = register("dark_oak_launchpad", new LaunchPadBlock(Blocks.DARK_OAK_PRESSURE_PLATE));
48-
public static LaunchPadBlock LIGHT_WEIGHTED_LAUNCHPAD_BLOCK = register("light_weighted_launchpad", new LaunchPadBlock(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE));
49-
public static LaunchPadBlock HEAVY_WEIGHTED_LAUNCHPAD_BLOCK = register("heavy_weighted_launchpad", new LaunchPadBlock(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE));
50-
public static LaunchPadBlock CRIMSON_LAUNCHPAD_BLOCK = register("crimson_launchpad", new LaunchPadBlock(Blocks.CRIMSON_PRESSURE_PLATE));
51-
public static LaunchPadBlock WARPED_LAUNCHPAD_BLOCK = register("warped_launchpad", new LaunchPadBlock(Blocks.WARPED_PRESSURE_PLATE));
52-
public static LaunchPadBlock POLISHED_BLACKSTONE_LAUNCHPAD_BLOCK = register("polished_blackstone_launchpad", new LaunchPadBlock(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE));
46+
public static LaunchPadBlock STONE_LAUNCHPAD_BLOCK = register("stone_launchpad", settings -> new LaunchPadBlock(settings, Blocks.STONE_PRESSURE_PLATE));
47+
public static LaunchPadBlock OAK_LAUNCHPAD_BLOCK = register("oak_launchpad", settings -> new LaunchPadBlock(settings, Blocks.OAK_PRESSURE_PLATE));
48+
public static LaunchPadBlock SPRUCE_LAUNCHPAD_BLOCK = register("spruce_launchpad", settings -> new LaunchPadBlock(settings, Blocks.SPRUCE_PRESSURE_PLATE));
49+
public static LaunchPadBlock BIRCH_LAUNCHPAD_BLOCK = register("birch_launchpad", settings -> new LaunchPadBlock(settings, Blocks.BIRCH_PRESSURE_PLATE));
50+
public static LaunchPadBlock JUNGLE_LAUNCHPAD_BLOCK = register("jungle_launchpad", settings -> new LaunchPadBlock(settings, Blocks.JUNGLE_PRESSURE_PLATE));
51+
public static LaunchPadBlock ACACIA_LAUNCHPAD_BLOCK = register("acacia_launchpad", settings -> new LaunchPadBlock(settings, Blocks.ACACIA_PRESSURE_PLATE));
52+
public static LaunchPadBlock DARK_OAK_LAUNCHPAD_BLOCK = register("dark_oak_launchpad", settings -> new LaunchPadBlock(settings, Blocks.DARK_OAK_PRESSURE_PLATE));
53+
public static LaunchPadBlock LIGHT_WEIGHTED_LAUNCHPAD_BLOCK = register("light_weighted_launchpad", settings -> new LaunchPadBlock(settings, Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE));
54+
public static LaunchPadBlock HEAVY_WEIGHTED_LAUNCHPAD_BLOCK = register("heavy_weighted_launchpad", settings -> new LaunchPadBlock(settings, Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE));
55+
public static LaunchPadBlock CRIMSON_LAUNCHPAD_BLOCK = register("crimson_launchpad", settings -> new LaunchPadBlock(settings, Blocks.CRIMSON_PRESSURE_PLATE));
56+
public static LaunchPadBlock WARPED_LAUNCHPAD_BLOCK = register("warped_launchpad", settings -> new LaunchPadBlock(settings, Blocks.WARPED_PRESSURE_PLATE));
57+
public static LaunchPadBlock POLISHED_BLACKSTONE_LAUNCHPAD_BLOCK = register("polished_blackstone_launchpad", settings -> new LaunchPadBlock(settings, Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE));
5358

54-
public static TeamBarrierBlock TEAM_BARRIER_BLOCK = register("team_barrier", new TeamBarrierBlock());
59+
public static TeamBarrierBlock TEAM_BARRIER_BLOCK = register("team_barrier", TeamBarrierBlock::new);
5560

5661
public static BlockEntityType<TeamBarrierBlockEntity> TEAM_BARRIER_BLOCK_ENTITY = Registry.register(Registries.BLOCK_ENTITY_TYPE,
5762
Quakecraft.id("team_barrier"),
5863
FabricBlockEntityTypeBuilder.create(TeamBarrierBlockEntity::new, TEAM_BARRIER_BLOCK).build()
5964
);
6065

61-
private static <T extends Block> T register(String identifier, T block) {
62-
return register(Registries.BLOCK, identifier, block);
66+
private static <T extends Block> T register(String identifier, Function<AbstractBlock.Settings, T> function) {
67+
return register(Registries.BLOCK, identifier, function.apply(AbstractBlock.Settings.create().registryKey(RegistryKey.of(RegistryKeys.BLOCK, Quakecraft.id(identifier)))));
6368
}
6469

6570
private static <P, T extends P> T register(Registry<P> registry, String name, T item) {

‎src/main/java/dev/lambdaurora/quakecraft/block/LaunchPadBlock.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import dev.lambdaurora.quakecraft.Quakecraft;
2121
import dev.lambdaurora.quakecraft.QuakecraftRegistry;
2222
import eu.pb4.polymer.core.api.block.PolymerBlock;
23-
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
2423
import net.fabricmc.fabric.api.util.NbtType;
2524
import net.minecraft.block.*;
2625
import net.minecraft.entity.Entity;
@@ -39,6 +38,7 @@
3938
import net.minecraft.util.shape.VoxelShape;
4039
import net.minecraft.world.BlockView;
4140
import net.minecraft.world.World;
41+
import xyz.nucleoid.packettweaker.PacketContext;
4242

4343
/**
4444
* Represents a launch pad block.
@@ -54,8 +54,8 @@ public class LaunchPadBlock extends Block implements PolymerBlock {
5454
protected static final VoxelShape SHAPE = Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 5.0, 16.0);
5555
private final Block proxy;
5656

57-
public LaunchPadBlock(Block proxy) {
58-
super(FabricBlockSettings.create().noCollision().dropsNothing());
57+
public LaunchPadBlock(AbstractBlock.Settings settings, Block proxy) {
58+
super(settings.noCollision().dropsNothing());
5959
this.setDefaultState(this.stateManager.getDefaultState()
6060
.with(Properties.HORIZONTAL_FACING, Direction.NORTH)
6161
.with(POWER, 3));
@@ -83,7 +83,7 @@ public void onEntityCollision(BlockState state, World world, BlockPos pos, Entit
8383
var vector = getVector(angle, entity.getPitch(1.f), entity.getYaw(1.f), state.get(POWER));
8484
entity.setVelocity(vector.getX(), vector.getY(), vector.getZ());
8585
if (entity instanceof ServerPlayerEntity) {
86-
((ServerPlayerEntity) entity).networkHandler.send(new EntityVelocityUpdateS2CPacket(entity));
86+
((ServerPlayerEntity) entity).networkHandler.sendPacket(new EntityVelocityUpdateS2CPacket(entity));
8787
}
8888
}
8989

@@ -114,8 +114,8 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po
114114
}
115115

116116
@Override
117-
public Block getPolymerBlock(BlockState state) {
118-
return this.proxy;
117+
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
118+
return this.proxy.getDefaultState();
119119
}
120120

121121
@Override
@@ -126,7 +126,7 @@ public BlockRenderType getRenderType(BlockState state) {
126126
public static BlockState fromNbt(NbtCompound data) {
127127
Block block = QuakecraftRegistry.STONE_LAUNCHPAD_BLOCK;
128128
if (data.contains("type", NbtType.STRING)) {
129-
block = Registries.BLOCK.getOrEmpty(Quakecraft.id(data.getString("type") + "_launchpad")).orElse(QuakecraftRegistry.STONE_LAUNCHPAD_BLOCK);
129+
block = Registries.BLOCK.getOptionalValue(Quakecraft.id(data.getString("type") + "_launchpad")).orElse(QuakecraftRegistry.STONE_LAUNCHPAD_BLOCK);
130130
}
131131
var state = block.getDefaultState();
132132
Direction direction = Quakecraft.getDirectionByName(data.getString("direction"));

‎src/main/java/dev/lambdaurora/quakecraft/block/TeamBarrierBlock.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import dev.lambdaurora.quakecraft.util.RayAccessor;
2626
import dev.lambdaurora.quakecraft.util.UsefulEntityShapeContext;
2727
import eu.pb4.polymer.core.api.block.PolymerBlock;
28-
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
2928
import net.minecraft.block.*;
3029
import net.minecraft.block.entity.BlockEntity;
3130
import net.minecraft.server.network.ServerPlayerEntity;
@@ -35,7 +34,8 @@
3534
import net.minecraft.util.shape.VoxelShapes;
3635
import net.minecraft.world.BlockView;
3736
import org.jetbrains.annotations.Nullable;
38-
import xyz.nucleoid.plasmid.game.common.team.GameTeam;
37+
import xyz.nucleoid.packettweaker.PacketContext;
38+
import xyz.nucleoid.plasmid.api.game.common.team.GameTeam;
3939

4040
/**
4141
* Represents a team barrier block.
@@ -47,9 +47,14 @@
4747
* @since 1.5.0
4848
*/
4949
public class TeamBarrierBlock extends BlockWithEntity implements PolymerBlock {
50-
public TeamBarrierBlock() {
51-
super(FabricBlockSettings.create().mapColor(MapColor.NONE).strength(-1.0F, 3600000.0F)
52-
.nonOpaque().collidable(true).dropsNothing());
50+
public TeamBarrierBlock(AbstractBlock.Settings settings) {
51+
super(settings.mapColor(MapColor.CLEAR).strength(-1.0F, 3600000.0F)
52+
.nonOpaque().dynamicBounds().dropsNothing());
53+
}
54+
55+
@Override
56+
protected MapCodec<? extends BlockWithEntity> getCodec() {
57+
return null;
5358
}
5459

5560
@Override
@@ -84,8 +89,8 @@ public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos
8489
}
8590

8691
@Override
87-
public Block getPolymerBlock(BlockState state) {
88-
return Blocks.AIR;
92+
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
93+
return Blocks.AIR.getDefaultState();
8994
}
9095

9196
@Override
@@ -101,9 +106,4 @@ public static void createAt(ServerWorld world, BlockPos pos, @Nullable GameTeam
101106
var blockEntity = QuakecraftRegistry.TEAM_BARRIER_BLOCK_ENTITY.get(world, pos);
102107
blockEntity.setTeam(team);
103108
}
104-
105-
@Override
106-
protected MapCodec<? extends BlockWithEntity> method_53969() {
107-
return null;
108-
}
109109
}

‎src/main/java/dev/lambdaurora/quakecraft/block/entity/TeamBarrierBlockEntity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import net.minecraft.block.entity.BlockEntity;
2323
import net.minecraft.util.math.BlockPos;
2424
import org.jetbrains.annotations.Nullable;
25-
import xyz.nucleoid.plasmid.game.common.team.GameTeam;
25+
import xyz.nucleoid.plasmid.api.game.common.team.GameTeam;
2626

2727
/**
2828
* Represents the team barrier block entity.

0 commit comments

Comments
 (0)