Skip to content

Block States API #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpaceWalkerRS wants to merge 5 commits into
base: gen2
Choose a base branch
from
Open

Block States API #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dbaabb
[core] add util cartesian product
SpaceWalkerRS May 21, 2026
22e9a0c
[core] add BlockPos and Direction
SpaceWalkerRS May 29, 2026
df6b0fe
Implement blockstates API
SpaceWalkerRS May 17, 2026
3c099a1
[blocks/items] move block extension out into blockstates
SpaceWalkerRS Sep 8, 2026
3747f90
[blocks] add BlockState registry fixer to Registry Sync
SpaceWalkerRS Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 0 additions & 9 deletions ...s-mc13w36a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/api/block/BlocksExtension.java
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...ocks-mc13w36a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/impl/BlockRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import net.minecraft.block.Block;

import net.ornithemc.osl.blocks.api.BlockEvents;
import net.ornithemc.osl.blocks.impl.block.BlockStateRegistryFixer;
import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
import net.ornithemc.osl.core.api.util.NamespacedIdentifiers;
import net.ornithemc.osl.registries.api.registry.DefaultedRegistry;
import net.ornithemc.osl.registries.api.registry.Registry;
import net.ornithemc.osl.registries.api.registry.RegistryKeys;
Expand Down Expand Up @@ -78,6 +80,7 @@ public static <T extends Block> T register(int id, NamespacedIdentifier key, T b

public static void init() {
SyncedRegistries.register(RegistryKeys.BLOCK);
SyncedRegistries.registerFixer(RegistryKeys.BLOCK, NamespacedIdentifiers.from("blockstate"), new BlockStateRegistryFixer());
}

public static void unlock() {
Expand Down
26 changes: 26 additions & 0 deletions ...a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/impl/block/BlockStateRegistryFixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package net.ornithemc.osl.blocks.impl.block;

import net.minecraft.block.Block;

import net.ornithemc.osl.blocks.api.BlockRegistry;
import net.ornithemc.osl.blockstates.api.block.state.BlockState;
import net.ornithemc.osl.registries.api.registry.sync.IdFixer;

public class BlockStateRegistryFixer implements IdFixer {

@Override
public void apply() {
Block.STATE_REGISTRY.clear();

for (Block block : BlockRegistry.REGISTRY) {
int blockId = BlockRegistry.getId(block);

for (BlockState state : block.stateDefinition().all()) {
int metadata = block.getMetadataFromState(state);
int stateId = blockId << 4 | metadata;

Block.STATE_REGISTRY.put(state, stateId);
}
}
}
}
6 changes: 0 additions & 6 deletions ...3w36a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/impl/block/BlocksExtensionImpl.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...w36a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/AirBlockMixin.java
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions ...c13w36a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/BlockMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
import net.minecraft.entity.living.mob.monster.EndermanEntity;

import net.ornithemc.osl.blocks.api.BlockRegistry;
import net.ornithemc.osl.blocks.api.block.BlockExtension;
import net.ornithemc.osl.blocks.impl.BlockRegistryImpl;
import net.ornithemc.osl.blocks.impl.BlocksMixinPlugin;
import net.ornithemc.osl.blocks.impl.block.AirBlock;
import net.ornithemc.osl.blocks.impl.block.BlockPostInit;
import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
import net.ornithemc.osl.core.api.util.NamespacedIdentifiers;
Expand All @@ -24,7 +21,7 @@
import net.ornithemc.osl.registries.api.registry.sync.BooleanArrayMapper;

@Mixin(Block.class)
public class BlockMixin implements BlockExtension {
public class BlockMixin {

@Shadow
private String key;
Expand All @@ -37,10 +34,6 @@ public class BlockMixin implements BlockExtension {
)
private static void osl$blocks$unlockBlockRegistry(CallbackInfo ci) {
BlockRegistryImpl.unlock();

if (!BlocksMixinPlugin.AIR_BLOCK_EXISTS) {
Block.REGISTRY.register(0, "air", new AirBlock());
}
}

@Inject(
Expand Down Expand Up @@ -92,9 +85,4 @@ public class BlockMixin implements BlockExtension {
public String toString() {
return "Block{" + BlockRegistryImpl.getIdentifier((Block) (Object) this) + "}";
}

@Override
public boolean isAir() {
return false;
}
}
11 changes: 0 additions & 11 deletions ...13w36a-mc14w26c/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/BlocksMixin.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion libraries/blocks/blocks-mc13w36a-mc14w26c/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"osl-text-components": "\u003e\u003d0.1.0-",
"osl-networking": "\u003e\u003d0.10.0",
"osl-networking-impl": "\u003e\u003d0.2.0",
"osl-registries": "\u003e\u003d0.1.0"
"osl-registries": "\u003e\u003d0.1.0",
"osl-blockstates": "\u003e\u003d0.1.0-"
},
"name": "OSL Blocks",
"description": "Blocks API and events.",
Expand Down
3 changes: 0 additions & 3 deletions libraries/blocks/blocks-mc13w36a-mc14w26c/src/main/resources/osl.blocks.classtweaker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@ transitive-accessible method net/minecraft/block/Block setKey (Ljava/lang/String
transitive-accessible method net/minecraft/block/Block setCreativeModeTab (Lnet/minecraft/item/CreativeModeTab;)Lnet/minecraft/block/Block;
transitive-accessible method net/minecraft/block/Block setSpriteName (Ljava/lang/String;)Lnet/minecraft/block/Block;

transitive-inject-interface net/minecraft/block/Block net/ornithemc/osl/blocks/impl/block/BlockExtensionImpl
transitive-inject-interface net/minecraft/block/Blocks net/ornithemc/osl/blocks/impl/block/BlocksExtensionImpl

accessible field net/minecraft/entity/living/mob/monster/EndermanEntity HOLDABLE_BLOCKS [Z

3 changes: 0 additions & 3 deletions libraries/blocks/blocks-mc13w36a-mc14w26c/src/main/resources/osl.blocks.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
"minVersion": "0.8",
"package": "net.ornithemc.osl.blocks.impl.mixin",
"compatibilityLevel": "JAVA_8",
"plugin": "net.ornithemc.osl.blocks.impl.BlocksMixinPlugin",
"mixins": [
"common.AirBlockMixin",
"common.BlockMixin",
"common.BlocksMixin",
"common.EndermanEntityMixin",
"common.FireBlockMixin",
"common.StatsMixin"
Expand Down
1 change: 1 addition & 0 deletions ...a-mc15w35a/src/main/java/net/ornithemc/osl/blocks/impl/block/BlockStateRegistryFixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.minecraft.block.Block;
import net.minecraft.block.state.BlockState;

import net.ornithemc.osl.blocks.api.BlockRegistry;
import net.ornithemc.osl.registries.api.registry.sync.IdFixer;
import net.ornithemc.osl.registries.impl.access.Clearable;
Expand Down
16 changes: 0 additions & 16 deletions ...w27a-mc15w35a/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/AirBlockMixin.java
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions ...c14w27a-mc15w35a/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/BlockMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
import net.minecraft.block.Block;

import net.ornithemc.osl.blocks.api.BlockRegistry;
import net.ornithemc.osl.blocks.api.block.BlockExtension;
import net.ornithemc.osl.blocks.impl.BlockRegistryImpl;
import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
import net.ornithemc.osl.core.impl.util.Util;

@Mixin(Block.class)
public class BlockMixin implements BlockExtension {
public class BlockMixin {

@Shadow
private String key;
Expand Down Expand Up @@ -59,9 +58,4 @@ public class BlockMixin implements BlockExtension {
}
}
}

@Override
public boolean isAir() {
return false;
}
}
3 changes: 2 additions & 1 deletion libraries/blocks/blocks-mc14w27a-mc15w35a/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"osl-text-components": "\u003e\u003d0.1.0-",
"osl-networking": "\u003e\u003d0.10.0",
"osl-networking-impl": "\u003e\u003d0.2.0",
"osl-registries": "\u003e\u003d0.1.0"
"osl-registries": "\u003e\u003d0.1.0",
"osl-blockstates": "\u003e\u003d0.1.0-"
},
"name": "OSL Blocks",
"description": "Blocks API and events.",
Expand Down
2 changes: 0 additions & 2 deletions libraries/blocks/blocks-mc14w27a-mc15w35a/src/main/resources/osl.blocks.classtweaker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ transitive-accessible method net/minecraft/block/Block setTicksRandomly (Z)Lnet/
transitive-accessible method net/minecraft/block/Block setKey (Ljava/lang/String;)Lnet/minecraft/block/Block;
transitive-accessible method net/minecraft/block/Block disableStats ()Lnet/minecraft/block/Block;
transitive-accessible method net/minecraft/block/Block setCreativeModeTab (Lnet/minecraft/item/CreativeModeTab;)Lnet/minecraft/block/Block;

transitive-inject-interface net/minecraft/block/Block net/ornithemc/osl/blocks/impl/block/BlockExtensionImpl
1 change: 0 additions & 1 deletion libraries/blocks/blocks-mc14w27a-mc15w35a/src/main/resources/osl.blocks.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"package": "net.ornithemc.osl.blocks.impl.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"common.AirBlockMixin",
"common.BlockMixin",
"common.StatsMixin"
],
Expand Down
1 change: 1 addition & 0 deletions ...a-mc17w46a/src/main/java/net/ornithemc/osl/blocks/impl/block/BlockStateRegistryFixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.minecraft.block.Block;
import net.minecraft.block.state.BlockState;

import net.ornithemc.osl.blocks.api.BlockRegistry;
import net.ornithemc.osl.registries.api.registry.sync.IdFixer;
import net.ornithemc.osl.registries.impl.access.Clearable;
Expand Down
16 changes: 0 additions & 16 deletions ...w36a-mc17w46a/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/AirBlockMixin.java
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions ...c15w36a-mc17w46a/src/main/java/net/ornithemc/osl/blocks/impl/mixin/common/BlockMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
import net.minecraft.block.Block;

import net.ornithemc.osl.blocks.api.BlockRegistry;
import net.ornithemc.osl.blocks.api.block.BlockExtension;
import net.ornithemc.osl.blocks.impl.BlockRegistryImpl;
import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
import net.ornithemc.osl.core.impl.util.Util;

@Mixin(Block.class)
public class BlockMixin implements BlockExtension {
public class BlockMixin {

@Shadow
private String key;
Expand Down Expand Up @@ -59,9 +58,4 @@ public class BlockMixin implements BlockExtension {
}
}
}

@Override
public boolean isAir() {
return false;
}
}
3 changes: 2 additions & 1 deletion libraries/blocks/blocks-mc15w36a-mc17w46a/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"osl-text-components": "\u003e\u003d0.1.0-",
"osl-networking": "\u003e\u003d0.10.0",
"osl-networking-impl": "\u003e\u003d0.2.0",
"osl-registries": "\u003e\u003d0.1.0"
"osl-registries": "\u003e\u003d0.1.0",
"osl-blockstates": "\u003e\u003d0.1.0-"
},
"name": "OSL Blocks",
"description": "Blocks API and events.",
Expand Down
2 changes: 0 additions & 2 deletions libraries/blocks/blocks-mc15w36a-mc17w46a/src/main/resources/osl.blocks.classtweaker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ transitive-accessible method net/minecraft/block/Block setTicksRandomly (Z)Lnet/
transitive-accessible method net/minecraft/block/Block setKey (Ljava/lang/String;)Lnet/minecraft/block/Block;
transitive-accessible method net/minecraft/block/Block disableStats ()Lnet/minecraft/block/Block;
transitive-accessible method net/minecraft/block/Block setCreativeModeTab (Lnet/minecraft/item/CreativeModeTab;)Lnet/minecraft/block/Block;

transitive-inject-interface net/minecraft/block/Block net/ornithemc/osl/blocks/impl/block/BlockExtensionImpl
1 change: 0 additions & 1 deletion libraries/blocks/blocks-mc15w36a-mc17w46a/src/main/resources/osl.blocks.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"compatibilityLevel": "JAVA_8",
"plugin": "net.ornithemc.osl.blocks.impl.BlocksMixinPlugin",
"mixins": [
"common.AirBlockMixin",
"common.BlockMixin",
"common.StatsMixin"
],
Expand Down
3 changes: 2 additions & 1 deletion libraries/blocks/blocks-mc17w47a-mc18w31a/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"osl-text-components": "\u003e\u003d0.1.0-",
"osl-networking": "\u003e\u003d0.10.0",
"osl-networking-impl": "\u003e\u003d0.2.0",
"osl-registries": "\u003e\u003d0.1.0"
"osl-registries": "\u003e\u003d0.1.0",
"osl-blockstates": "\u003e\u003d0.1.0-"
},
"name": "OSL Blocks",
"description": "Blocks API and events.",
Expand Down
3 changes: 2 additions & 1 deletion libraries/blocks/blocks-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"osl-text-components": "\u003e\u003d0.1.0-",
"osl-networking": "\u003e\u003d0.10.0",
"osl-networking-impl": "\u003e\u003d0.2.0",
"osl-registries": "\u003e\u003d0.1.0"
"osl-registries": "\u003e\u003d0.1.0",
"osl-blockstates": "\u003e\u003d0.1.0-"
},
"name": "OSL Blocks",
"description": "Blocks API and events.",
Expand Down
3 changes: 2 additions & 1 deletion libraries/blocks/blocks-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"osl-text-components": "\u003e\u003d0.1.0-",
"osl-networking": "\u003e\u003d0.10.0",
"osl-networking-impl": "\u003e\u003d0.2.0",
"osl-registries": "\u003e\u003d0.1.0"
"osl-registries": "\u003e\u003d0.1.0",
"osl-blockstates": "\u003e\u003d0.1.0-"
},
"name": "OSL Blocks",
"description": "Blocks API and events.",
Expand Down
10 changes: 0 additions & 10 deletions ...-mca1.0.1_01-mc1.6.4/src/main/java/net/ornithemc/osl/blocks/api/block/BlockExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,4 @@ public interface BlockExtension {
DefaultedRegistry<Block> REGISTRY = BlockRegistryImpl.REGISTRY;
int AUTO_ASSIGN_ID = -172;

/**
* @return whether this block is air.
*/
boolean isAir();

/**
* @return whether this block is the same as the given block.
*/
boolean is(Block block);

}
11 changes: 0 additions & 11 deletions ...s/blocks-mca1.0.1_01-mc1.6.4/src/main/java/net/ornithemc/osl/blocks/api/block/Blocks.java
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions ...ks-mca1.0.1_01-mc1.6.4/src/main/java/net/ornithemc/osl/blocks/impl/BlockRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import net.ornithemc.osl.blocks.api.BlockEvents;
import net.ornithemc.osl.blocks.impl.block.BlockIdFixer;
import net.ornithemc.osl.blocks.impl.block.BlockStateRegistryFixer;
import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
import net.ornithemc.osl.core.api.util.NamespacedIdentifiers;
import net.ornithemc.osl.registries.api.registry.DefaultedRegistry;
Expand Down Expand Up @@ -88,6 +89,7 @@ public static <T extends Block> T register(int id, NamespacedIdentifier key, T b
public static void init() {
SyncedRegistries.register(RegistryKeys.BLOCK);
SyncedRegistries.registerFixer(RegistryKeys.BLOCK, NamespacedIdentifiers.from("block/id"), new BlockIdFixer());
SyncedRegistries.registerFixer(RegistryKeys.BLOCK, NamespacedIdentifiers.from("blockstate"), new BlockStateRegistryFixer());
}

public static void unlock() {
Expand Down
Loading
Loading