Skip to content
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

Update/1.20.3 #82

Merged
merged 16 commits into from
Apr 12, 2024
Merged

Update/1.20.3 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4d61fb6
chore: 1.20.3 things
RealBauHD Dec 21, 2023
faa3d10
chore: registry
RealBauHD Dec 21, 2023
6f12334
chore: 1.21 mobs
RealBauHD Dec 21, 2023
08a3672
Merge branch 'master' into update/1.20.3
RealBauHD Jan 14, 2024
1fbc140
chore: plain serializer to write at least something
RealBauHD Jan 14, 2024
0b41561
Merge branch 'master' into update/1.20.3
RealBauHD Jan 26, 2024
7fbdb69
Merge branch 'master' into update/1.20.3
RealBauHD Jan 26, 2024
4c5109f
chore: better serializing of components
RealBauHD Jan 26, 2024
9ee2f17
Merge branch 'master' into update/1.20.3
RealBauHD Mar 11, 2024
5d35836
fix: ;
RealBauHD Mar 11, 2024
573b6d5
Merge branch 'master' into update/1.20.3
RealBauHD Mar 16, 2024
6d1ac85
Merge branch 'refs/heads/master' into update/1.20.3
RealBauHD Apr 6, 2024
491b32f
chore: send chunk waiting info
RealBauHD Apr 12, 2024
08c3db1
chore: update dependencies
RealBauHD Apr 12, 2024
58f59e1
chore: more advanced component serialisation
RealBauHD Apr 12, 2024
96cc194
chore: remove debugs
RealBauHD Apr 12, 2024
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
59 changes: 58 additions & 1 deletion api/src/main/java/io/github/sculkpowered/server/container/item/Material.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ public enum Material {
POLISHED_DEEPSLATE("minecraft:polished_deepslate"),
CALCITE("minecraft:calcite"),
TUFF("minecraft:tuff"),
TUFF_SLAB("minecraft:tuff_slab"),
TUFF_STAIRS("minecraft:tuff_stairs"),
TUFF_WALL("minecraft:tuff_wall"),
CHISELED_TUFF("minecraft:chiseled_tuff"),
POLISHED_TUFF("minecraft:polished_tuff"),
POLISHED_TUFF_SLAB("minecraft:polished_tuff_slab"),
POLISHED_TUFF_STAIRS("minecraft:polished_tuff_stairs"),
POLISHED_TUFF_WALL("minecraft:polished_tuff_wall"),
TUFF_BRICKS("minecraft:tuff_bricks"),
TUFF_BRICK_SLAB("minecraft:tuff_brick_slab"),
TUFF_BRICK_STAIRS("minecraft:tuff_brick_stairs"),
TUFF_BRICK_WALL("minecraft:tuff_brick_wall"),
CHISELED_TUFF_BRICKS("minecraft:chiseled_tuff_bricks"),
DRIPSTONE_BLOCK("minecraft:dripstone_block"),
GRASS_BLOCK("minecraft:grass_block"),
DIRT("minecraft:dirt"),
Expand Down Expand Up @@ -91,6 +104,10 @@ public enum Material {
EXPOSED_COPPER("minecraft:exposed_copper"),
WEATHERED_COPPER("minecraft:weathered_copper"),
OXIDIZED_COPPER("minecraft:oxidized_copper"),
CHISELED_COPPER("minecraft:chiseled_copper"),
EXPOSED_CHISELED_COPPER("minecraft:exposed_chiseled_copper"),
WEATHERED_CHISELED_COPPER("minecraft:weathered_chiseled_copper"),
OXIDIZED_CHISELED_COPPER("minecraft:oxidized_chiseled_copper"),
CUT_COPPER("minecraft:cut_copper"),
EXPOSED_CUT_COPPER("minecraft:exposed_cut_copper"),
WEATHERED_CUT_COPPER("minecraft:weathered_cut_copper"),
Expand All @@ -107,6 +124,10 @@ public enum Material {
WAXED_EXPOSED_COPPER("minecraft:waxed_exposed_copper"),
WAXED_WEATHERED_COPPER("minecraft:waxed_weathered_copper"),
WAXED_OXIDIZED_COPPER("minecraft:waxed_oxidized_copper"),
WAXED_CHISELED_COPPER("minecraft:waxed_chiseled_copper"),
WAXED_EXPOSED_CHISELED_COPPER("minecraft:waxed_exposed_chiseled_copper"),
WAXED_WEATHERED_CHISELED_COPPER("minecraft:waxed_weathered_chiseled_copper"),
WAXED_OXIDIZED_CHISELED_COPPER("minecraft:waxed_oxidized_chiseled_copper"),
WAXED_CUT_COPPER("minecraft:waxed_cut_copper"),
WAXED_EXPOSED_CUT_COPPER("minecraft:waxed_exposed_cut_copper"),
WAXED_WEATHERED_CUT_COPPER("minecraft:waxed_weathered_cut_copper"),
Expand Down Expand Up @@ -182,7 +203,7 @@ public enum Material {
CHISELED_SANDSTONE("minecraft:chiseled_sandstone"),
CUT_SANDSTONE("minecraft:cut_sandstone"),
COBWEB("minecraft:cobweb"),
GRASS("minecraft:grass"),
SHORT_GRASS("minecraft:short_grass"),
FERN("minecraft:fern"),
AZALEA("minecraft:azalea"),
FLOWERING_AZALEA("minecraft:flowering_azalea"),
Expand Down Expand Up @@ -709,6 +730,14 @@ public enum Material {
BAMBOO_DOOR("minecraft:bamboo_door"),
CRIMSON_DOOR("minecraft:crimson_door"),
WARPED_DOOR("minecraft:warped_door"),
COPPER_DOOR("minecraft:copper_door"),
EXPOSED_COPPER_DOOR("minecraft:exposed_copper_door"),
WEATHERED_COPPER_DOOR("minecraft:weathered_copper_door"),
OXIDIZED_COPPER_DOOR("minecraft:oxidized_copper_door"),
WAXED_COPPER_DOOR("minecraft:waxed_copper_door"),
WAXED_EXPOSED_COPPER_DOOR("minecraft:waxed_exposed_copper_door"),
WAXED_WEATHERED_COPPER_DOOR("minecraft:waxed_weathered_copper_door"),
WAXED_OXIDIZED_COPPER_DOOR("minecraft:waxed_oxidized_copper_door"),
IRON_TRAPDOOR("minecraft:iron_trapdoor"),
OAK_TRAPDOOR("minecraft:oak_trapdoor"),
SPRUCE_TRAPDOOR("minecraft:spruce_trapdoor"),
Expand All @@ -721,6 +750,14 @@ public enum Material {
BAMBOO_TRAPDOOR("minecraft:bamboo_trapdoor"),
CRIMSON_TRAPDOOR("minecraft:crimson_trapdoor"),
WARPED_TRAPDOOR("minecraft:warped_trapdoor"),
COPPER_TRAPDOOR("minecraft:copper_trapdoor"),
EXPOSED_COPPER_TRAPDOOR("minecraft:exposed_copper_trapdoor"),
WEATHERED_COPPER_TRAPDOOR("minecraft:weathered_copper_trapdoor"),
OXIDIZED_COPPER_TRAPDOOR("minecraft:oxidized_copper_trapdoor"),
WAXED_COPPER_TRAPDOOR("minecraft:waxed_copper_trapdoor"),
WAXED_EXPOSED_COPPER_TRAPDOOR("minecraft:waxed_exposed_copper_trapdoor"),
WAXED_WEATHERED_COPPER_TRAPDOOR("minecraft:waxed_weathered_copper_trapdoor"),
WAXED_OXIDIZED_COPPER_TRAPDOOR("minecraft:waxed_oxidized_copper_trapdoor"),
OAK_FENCE_GATE("minecraft:oak_fence_gate"),
SPRUCE_FENCE_GATE("minecraft:spruce_fence_gate"),
BIRCH_FENCE_GATE("minecraft:birch_fence_gate"),
Expand Down Expand Up @@ -950,6 +987,7 @@ public enum Material {
RED_BED("minecraft:red_bed"),
BLACK_BED("minecraft:black_bed"),
COOKIE("minecraft:cookie"),
CRAFTER("minecraft:crafter"),
FILLED_MAP("minecraft:filled_map"),
SHEARS("minecraft:shears"),
MELON_SLICE("minecraft:melon_slice"),
Expand Down Expand Up @@ -981,6 +1019,7 @@ public enum Material {
BAT_SPAWN_EGG("minecraft:bat_spawn_egg"),
BEE_SPAWN_EGG("minecraft:bee_spawn_egg"),
BLAZE_SPAWN_EGG("minecraft:blaze_spawn_egg"),
BREEZE_SPAWN_EGG("minecraft:breeze_spawn_egg"),
CAT_SPAWN_EGG("minecraft:cat_spawn_egg"),
CAMEL_SPAWN_EGG("minecraft:camel_spawn_egg"),
CAVE_SPIDER_SPAWN_EGG("minecraft:cave_spider_spawn_egg"),
Expand Down Expand Up @@ -1264,6 +1303,24 @@ public enum Material {
SHELTER_POTTERY_SHERD("minecraft:shelter_pottery_sherd"),
SKULL_POTTERY_SHERD("minecraft:skull_pottery_sherd"),
SNORT_POTTERY_SHERD("minecraft:snort_pottery_sherd"),
COPPER_GRATE("minecraft:copper_grate"),
EXPOSED_COPPER_GRATE("minecraft:exposed_copper_grate"),
WEATHERED_COPPER_GRATE("minecraft:weathered_copper_grate"),
OXIDIZED_COPPER_GRATE("minecraft:oxidized_copper_grate"),
WAXED_COPPER_GRATE("minecraft:waxed_copper_grate"),
WAXED_EXPOSED_COPPER_GRATE("minecraft:waxed_exposed_copper_grate"),
WAXED_WEATHERED_COPPER_GRATE("minecraft:waxed_weathered_copper_grate"),
WAXED_OXIDIZED_COPPER_GRATE("minecraft:waxed_oxidized_copper_grate"),
COPPER_BULB("minecraft:copper_bulb"),
EXPOSED_COPPER_BULB("minecraft:exposed_copper_bulb"),
WEATHERED_COPPER_BULB("minecraft:weathered_copper_bulb"),
OXIDIZED_COPPER_BULB("minecraft:oxidized_copper_bulb"),
WAXED_COPPER_BULB("minecraft:waxed_copper_bulb"),
WAXED_EXPOSED_COPPER_BULB("minecraft:waxed_exposed_copper_bulb"),
WAXED_WEATHERED_COPPER_BULB("minecraft:waxed_weathered_copper_bulb"),
WAXED_OXIDIZED_COPPER_BULB("minecraft:waxed_oxidized_copper_bulb"),
TRIAL_SPAWNER("minecraft:trial_spawner"),
TRIAL_KEY("minecraft:trial_key"),
// END
;

Expand Down
6 changes: 6 additions & 0 deletions api/src/main/java/io/github/sculkpowered/server/entity/Breeze.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package io.github.sculkpowered.server.entity;

import org.jetbrains.annotations.ApiStatus.Experimental;

@Experimental // 1.21
public interface Breeze extends Entity {}
2 changes: 2 additions & 0 deletions api/src/main/java/io/github/sculkpowered/server/entity/EntityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public enum EntityType {
BLAZE("minecraft:blaze"),
BLOCK_DISPLAY("minecraft:block_display"),
BOAT("minecraft:boat"),
BREEZE("minecraft:breeze"),
CAMEL("minecraft:camel"),
CAT("minecraft:cat"),
CAVE_SPIDER("minecraft:cave_spider"),
Expand Down Expand Up @@ -122,6 +123,7 @@ public enum EntityType {
VINDICATOR("minecraft:vindicator"),
WANDERING_TRADER("minecraft:wandering_trader"),
WARDEN("minecraft:warden"),
WIND_CHARGE("minecraft:wind_charge"),
WITCH("minecraft:witch"),
WITHER("minecraft:wither"),
WITHER_SKELETON("minecraft:wither_skeleton"),
Expand Down
6 changes: 6 additions & 0 deletions api/src/main/java/io/github/sculkpowered/server/entity/WindCharge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package io.github.sculkpowered.server.entity;

import org.jetbrains.annotations.ApiStatus.Experimental;

@Experimental // 1.21
public interface WindCharge extends Entity {}
Loading