Merge branch 'oxygen-system'

# Conflicts:
#	src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
#	src/generated/resources/.cache/a8139181fab9cfd94e67697230cbaca839a05e1f
#	src/main/java/net/xevianlight/aphelion/core/init/ModItems.java
This commit is contained in:
XevianLight
2026-01-29 21:49:08 -07:00
16 changed files with 275 additions and 1 deletions

View File

@@ -0,0 +1,25 @@
package net.xevianlight.aphelion.block.custom;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.xevianlight.aphelion.block.entity.custom.OxygenTestBlockEntity;
import org.jetbrains.annotations.Nullable;
public class OxygenTestBlock extends Block implements EntityBlock {
public OxygenTestBlock(Properties properties) {
super(properties);
}
@Override
public @Nullable BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
return new OxygenTestBlockEntity(blockPos, blockState);
}
public static Properties getProperties() {
return Properties.of();
}
}