Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
e327f32
Refactor items
Creeperface01 Sep 10, 2020
eac549c
Commit current progress just to be able to continue at school
Creeperface01 Sep 13, 2020
e04850b
Finish base api
Creeperface01 Sep 18, 2020
d36b869
Merge branch 'bleeding' into item-refactor
Creeperface01 Sep 25, 2020
53bab3b
Rewrite more classes
Creeperface01 Sep 26, 2020
b24af7b
Add more serializers for wood types
Creeperface01 Sep 28, 2020
a4303d9
Update block hardness values
Creeperface01 Sep 30, 2020
79249e6
Update block attributes
Creeperface01 Oct 1, 2020
213fe2e
Update block attributes
Creeperface01 Oct 5, 2020
7903d9a
Update block tool tiers
Creeperface01 Oct 5, 2020
a0c0ca4
Update block attributes
Creeperface01 Oct 8, 2020
344e2bc
Initial work on API split
SupremeMortal Oct 10, 2020
a55709a
Implement all states correctly
Creeperface01 Oct 16, 2020
db66d77
Fix block states in generator configuration
Creeperface01 Oct 19, 2020
972e041
Merge remote-tracking branch 'origin/bleeding' into item-refactor
Creeperface01 Oct 19, 2020
0ff172a
Various bug fixes
Creeperface01 Oct 20, 2020
9aa3315
Add item constants
Creeperface01 Oct 21, 2020
3dcd015
Fix missing item meta serializer and id to type mappings
Creeperface01 Oct 25, 2020
fbdf4b4
Fix liquids a bit
Creeperface01 Oct 25, 2020
38a59b2
Fix creative items
Creeperface01 Oct 27, 2020
957a450
Send recipes
Creeperface01 Oct 28, 2020
64c2725
Merge remote-tracking branch 'origin/bleeding' into item-refactor
Creeperface01 Oct 28, 2020
7e7f1db
Merge remote-tracking branch 'origin/bleeding' into item-refactor
Creeperface01 Oct 29, 2020
9f7eb00
Fix incorrect instanceof checks
Creeperface01 Oct 30, 2020
0a7ea6c
Fix liquid behavior
Creeperface01 Oct 30, 2020
0136ebb
Merge remote-tracking branch 'origin/bleeding' into item-refactor
Creeperface01 Oct 30, 2020
1b175d9
Add default bounding boxes
Creeperface01 Nov 1, 2020
e587ac2
Merge remote-tracking branch 'origin/feature/api' into item-refactor
Creeperface01 Nov 6, 2020
3d708b3
Fix conflicts
Creeperface01 Nov 6, 2020
937afd2
Merge pull request #50 from CloudburstMC/item-refactor
SupremeMortal Nov 6, 2020
a5e17d9
Update protocol lib
Sleepybear Jan 3, 2021
d4fef57
Update ItemData arrays to lists
Sleepybear Jan 3, 2021
9e5dadb
Update palette dynamic generation
Sleepybear Jan 3, 2021
034ba36
remove debug
Sleepybear Jan 3, 2021
dbc65d2
Update BlockPaletteTest with new palette.
Sleepybear Jan 5, 2021
fdb7819
AIR is no longer runtime ID 0
Sleepybear Jan 6, 2021
a890e74
Refactor of BlockStorage and fix flower pot deserialisation
SupremeMortal Jan 10, 2021
63f2a4e
API Updates
Sleepybear Feb 1, 2021
4e8bad7
move EnchantmentTypes to API
Sleepybear Feb 4, 2021
728d86e
move EntityEvent to API and other updates
Sleepybear Feb 4, 2021
7856d1f
move AABB to API
Sleepybear Feb 4, 2021
e3c93f4
Move entity interfaces to API
Sleepybear Feb 4, 2021
edb829e
Move `impl` package to base `entity` package in Server repo
Sleepybear Feb 4, 2021
0ed53c5
Move Chunk and BlockEntity interfaces to API
Sleepybear Feb 4, 2021
b7f3e1d
Move BlockEntity to API
Sleepybear Feb 4, 2021
50988c1
Rename Player to CloudPlayer
Sleepybear Feb 5, 2021
7ad0afd
BaseEntity error fixes
Sleepybear Feb 5, 2021
0793ae3
Event fixes
Sleepybear Feb 5, 2021
0829056
Move firework data to API
Sleepybear Feb 5, 2021
817446c
migrate ResourcePack info
Sleepybear Feb 5, 2021
0cf3f6c
Player event fixes
Sleepybear Feb 6, 2021
8b8306a
implement Potions to API
Sleepybear Feb 8, 2021
e4094ca
Finsih Event API
Sleepybear Feb 10, 2021
5e84a4f
Inventory Interfaces
Sleepybear Feb 11, 2021
f675ba8
update protocol lib
Sleepybear Mar 10, 2021
7faafe8
update to use property for easier updating
Sleepybear Mar 10, 2021
7012e87
revert to com.nukkitx.math library
Sleepybear Mar 10, 2021
f1007d9
fixes
Sleepybear Mar 11, 2021
c95babd
Block Behavior fixes
Sleepybear Mar 12, 2021
bcff194
fixes and move ChunkManager to API
Sleepybear Mar 12, 2021
69c1909
Level and Chunk fixes
Sleepybear Mar 13, 2021
351ccbe
CloudPlayer fixes
Sleepybear Mar 16, 2021
a7be150
CloudLevel fixes
Sleepybear Mar 16, 2021
f105c75
CloudServer fixes
Sleepybear Mar 16, 2021
66bbd3c
Fixes
Sleepybear Mar 16, 2021
e6189b4
move data classes and fixes
Sleepybear Mar 17, 2021
799d7da
block entity and inventory fixes
Sleepybear Mar 17, 2021
889d479
remove duplicatated files
Sleepybear Mar 17, 2021
44c8df2
remove more duplicatated files
Sleepybear Mar 17, 2021
74281c3
more error fixes
Sleepybear Mar 18, 2021
21d40c7
Update block palette to 1.16.210
SupremeMortal Mar 18, 2021
082784c
Send message when level conversion is complete
SupremeMortal Mar 18, 2021
d42109a
Don't create dependency reduced pom
SupremeMortal Mar 18, 2021
1e48b9b
Server is now joinable with 1.16.210
SupremeMortal Mar 18, 2021
4540ac6
Finish error fixes
Sleepybear Mar 19, 2021
6bba574
re-add deprecated block trait and update BlockStateUpdaters lib
Sleepybear Mar 19, 2021
77fbb96
API Updates
Sleepybear Feb 1, 2021
8b5bb7b
move EnchantmentTypes to API
Sleepybear Feb 4, 2021
b1fb0d0
move EntityEvent to API and other updates
Sleepybear Feb 4, 2021
75e4781
move AABB to API
Sleepybear Feb 4, 2021
d0e30e9
Move entity interfaces to API
Sleepybear Feb 4, 2021
e3e66dd
Move `impl` package to base `entity` package in Server repo
Sleepybear Feb 4, 2021
5f667f0
Move Chunk and BlockEntity interfaces to API
Sleepybear Feb 4, 2021
6410dfe
Move BlockEntity to API
Sleepybear Feb 4, 2021
367761c
Rename Player to CloudPlayer
Sleepybear Feb 5, 2021
1759826
BaseEntity error fixes
Sleepybear Feb 5, 2021
54803e2
Event fixes
Sleepybear Feb 5, 2021
f42cc4f
Move firework data to API
Sleepybear Feb 5, 2021
38d49c4
migrate ResourcePack info
Sleepybear Feb 5, 2021
2aab5ed
Player event fixes
Sleepybear Feb 6, 2021
18a81d4
implement Potions to API
Sleepybear Feb 8, 2021
a267686
Finsih Event API
Sleepybear Feb 10, 2021
ef1e811
Inventory Interfaces
Sleepybear Feb 11, 2021
0c57392
update protocol lib
Sleepybear Mar 10, 2021
c8f0d5f
revert to com.nukkitx.math library
Sleepybear Mar 10, 2021
e5818bf
fixes
Sleepybear Mar 11, 2021
6a9dfd2
Block Behavior fixes
Sleepybear Mar 12, 2021
f68e78f
fixes and move ChunkManager to API
Sleepybear Mar 12, 2021
6723a2b
Level and Chunk fixes
Sleepybear Mar 13, 2021
b222220
CloudPlayer fixes
Sleepybear Mar 16, 2021
bbc8234
CloudLevel fixes
Sleepybear Mar 16, 2021
44ea3f0
CloudServer fixes
Sleepybear Mar 16, 2021
35d1c8a
Fixes
Sleepybear Mar 16, 2021
e2e40c0
move data classes and fixes
Sleepybear Mar 17, 2021
172ecf7
block entity and inventory fixes
Sleepybear Mar 17, 2021
2f5c0fc
remove duplicatated files
Sleepybear Mar 17, 2021
001a7d0
remove more duplicatated files
Sleepybear Mar 17, 2021
c76f77c
more error fixes
Sleepybear Mar 18, 2021
0ee7723
Finish error fixes
Sleepybear Mar 19, 2021
1bdb133
re-add deprecated block trait and update BlockStateUpdaters lib
Sleepybear Mar 19, 2021
ce002a1
rebase protocol-update branch
Sleepybear Mar 19, 2021
8aaf344
Merge remote-tracking branch 'Sleepy/api-changes' into api-changes
Sleepybear Mar 19, 2021
7fd9b6a
update block type with correct blocktraits
Sleepybear Mar 20, 2021
3013b1a
move Item data classes
Sleepybear Mar 20, 2021
6a84c09
convert to using recipes.json with string IDs
Sleepybear Mar 22, 2021
11b8dac
update submodules
Sleepybear Mar 22, 2021
9d669ec
Update item IDs
Sleepybear Mar 22, 2021
8d0c648
Update item IDs
Sleepybear Mar 22, 2021
2766454
Update Dye types
Sleepybear Mar 22, 2021
82b10aa
update boat IDs
Sleepybear Mar 22, 2021
d5f883b
load legacy ids from file
Sleepybear Mar 22, 2021
1e0e4c6
add spawn eggs
Sleepybear Mar 22, 2021
01ec256
implement unknown items
Sleepybear Mar 23, 2021
3b2ad19
add unregister methods to RecipeRegistry
Sleepybear Mar 23, 2021
bb00810
create player inventory interface
Sleepybear Mar 23, 2021
e14bdac
Update Skin data to expose to API
Sleepybear Mar 24, 2021
5633787
refactor block registry implementation
Sleepybear Mar 25, 2021
b5dd087
refactor skin processing
Sleepybear Mar 25, 2021
bd0f996
bugfix
Sleepybear Mar 25, 2021
34ad2be
Refactor Potion/Effect types to remove network data from API
Sleepybear Mar 26, 2021
1bd44f6
Start on Inventory refactor
Sleepybear Mar 26, 2021
c8eb8f1
Create inventory interfaces
Sleepybear Mar 26, 2021
64f642b
More inventory refactoring
Sleepybear Apr 12, 2021
ee541ff
Import updates
Sleepybear Apr 12, 2021
0f49dae
Build error fixes
Sleepybear Apr 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix liquids a bit
  • Loading branch information
Creeperface01 committed Oct 25, 2020
commit fbdf4b440e5a64d814c85d554184c96bf85cc6fc
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ public BlockColor getColor(Block block) {
}

public boolean canBeFlooded(BlockState state) {
return !state.getType().blocksWater();
val type = state.getType();
return type.isFloodable() || !type.blocksWater();
}

public boolean place(ItemStack item, Block block, Block target, Direction face, Vector3f clickPos, Player player) {
Expand Down