Altarik/ReFramed
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate off of deprecated APIs

Browse Source
This commit is contained in:
quat1024 2023-06-15 01:57:52 -04:00
parent fb457d1b37
commit 735e79ea78
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/cottonmc/templates/Templates.java
View File

@ -16,7 +16,7 @@ public class Templates implements ModInitializer {
public static final Block SLOPE = register("slope", new SlopeBlock(), ItemGroup.DECORATIONS); public static final Block SLOPE = register("slope", new SlopeBlock(), ItemGroup.DECORATIONS);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static final BlockEntityType<SlopeEntity> SLOPE_ENTITY = register("slope", SlopeEntity::new, SLOPE); public static final BlockEntityType<SlopeEntity> SLOPE_ENTITY = register("slope", SlopeEntity::new, SLOPE);
@Override @Override
public void onInitialize() { public void onInitialize() {
@ -31,7 +31,7 @@ public class Templates implements ModInitializer {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public static BlockEntityType register(String name, Supplier<BlockEntity> be, Block...blocks) { public static BlockEntityType register(String name, Supplier<BlockEntity> be, Block...blocks) {
return Registry.register(Registry.BLOCK_ENTITY, new Identifier(MODID, name), BlockEntityType.Builder.create(be, blocks).build(null)); return Registry.register(Registry.BLOCK_ENTITY, new Identifier(MODID, name), BlockEntityType.Builder.create(be, blocks).build(null));
} }
@ -39,5 +39,4 @@ public class Templates implements ModInitializer {
Registry.register(Registry.ITEM, new Identifier(MODID, name), item); Registry.register(Registry.ITEM, new Identifier(MODID, name), item);
return item; return item;
} }
} }

4
src/main/java/io/github/cottonmc/templates/block/SlopeBlock.java
View File

@ -1,7 +1,7 @@
package io.github.cottonmc.templates.block; package io.github.cottonmc.templates.block;
import io.github.cottonmc.templates.block.entity.SlopeEntity; import io.github.cottonmc.templates.block.entity.SlopeEntity;
import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.*; import net.minecraft.block.*;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.EntityContext; import net.minecraft.entity.EntityContext;
@ -27,7 +27,7 @@ public class SlopeBlock extends TemplateBlock {
public static final VoxelShape WEST = VoxelShapes.cuboid(0f, 0.5f, 0f, 0.5f, 1f, 1f); public static final VoxelShape WEST = VoxelShapes.cuboid(0f, 0.5f, 0f, 0.5f, 1f, 1f);
public SlopeBlock() { public SlopeBlock() {
super(FabricBlockSettings.of(Material.WOOD).build()); super(FabricBlockSettings.of(Material.WOOD));
this.setDefaultState(this.getStateManager().getDefaultState().with(FACING, Direction.NORTH).with(LIGHT, 0).with(REDSTONE, false)); this.setDefaultState(this.getStateManager().getDefaultState().with(FACING, Direction.NORTH).with(LIGHT, 0).with(REDSTONE, false));
} }

7
src/main/java/io/github/cottonmc/templates/block/entity/TemplateEntity.java
View File

@ -1,8 +1,8 @@
package io.github.cottonmc.templates.block.entity; package io.github.cottonmc.templates.block.entity;
import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable; import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity; import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity;
import net.fabricmc.fabric.api.server.PlayerStream;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
@ -18,7 +18,7 @@ public abstract class TemplateEntity extends BlockEntity implements BlockEntityC
protected BlockState renderedState = Blocks.AIR.getDefaultState(); protected BlockState renderedState = Blocks.AIR.getDefaultState();
protected boolean glowstone = false; protected boolean glowstone = false;
protected boolean redstone = false; protected boolean redstone = false;
private Block baseBlock; private final Block baseBlock;
public TemplateEntity(BlockEntityType<?> type, Block baseBlock) { public TemplateEntity(BlockEntityType<?> type, Block baseBlock) {
super(type); super(type);
@ -71,8 +71,7 @@ public abstract class TemplateEntity extends BlockEntity implements BlockEntityC
public void markDirty() { public void markDirty() {
super.markDirty(); super.markDirty();
if (world != null && !world.isClient) { if (world != null && !world.isClient) {
for (Object obj : PlayerStream.watching(this).toArray()) { for(ServerPlayerEntity player : PlayerLookup.tracking(this)) {
ServerPlayerEntity player = (ServerPlayerEntity) obj;
player.networkHandler.sendPacket(this.toUpdatePacket()); player.networkHandler.sendPacket(this.toUpdatePacket());
} }
world.updateNeighborsAlways(pos.offset(Direction.UP), baseBlock); world.updateNeighborsAlways(pos.offset(Direction.UP), baseBlock);

1
src/main/java/io/github/cottonmc/templates/util/SpriteSet.java
View File

@ -4,7 +4,6 @@ import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.client.texture.MissingSprite; import net.minecraft.client.texture.MissingSprite;
import org.apache.commons.lang3.ObjectUtils;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import net.fabricmc.fabric.api.renderer.v1.model.ModelHelper; import net.fabricmc.fabric.api.renderer.v1.model.ModelHelper;