Skip to content

Protocol update #113

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

Closed
Kazzuk wants to merge 42 commits into from
Closed

Protocol update #113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 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
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
fb85099
Fix plugin loading
rtm516 Mar 20, 2021
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
  •  
  •  
  •  
Next Next commit
Refactor items
  • Loading branch information
@Creeperface01
Creeperface01 committed Sep 10, 2020
commit e327f323fcc4d88585dd7aa46d4017ba7ba68190
10 changes: 5 additions & 5 deletions src/main/java/org/cloudburstmc/server/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
import org.cloudburstmc.server.command.CommandSender;
import org.cloudburstmc.server.command.ConsoleCommandSender;
import org.cloudburstmc.server.console.NukkitConsole;
import org.cloudburstmc.server.enchantment.CloudEnchantmentInstance;
import org.cloudburstmc.server.entity.Attribute;
import org.cloudburstmc.server.event.server.*;
import org.cloudburstmc.server.inject.CloudburstModule;
import org.cloudburstmc.server.inject.CloudburstPrivateModule;
import org.cloudburstmc.server.inventory.CraftingManager;
import org.cloudburstmc.server.inventory.Recipe;
import org.cloudburstmc.server.item.behavior.Item;
import org.cloudburstmc.server.item.enchantment.Enchantment;
import org.cloudburstmc.server.item.ItemStack;
import org.cloudburstmc.server.level.*;
import org.cloudburstmc.server.level.storage.StorageIds;
import org.cloudburstmc.server.locale.LocaleManager;
Expand Down Expand Up @@ -189,7 +189,7 @@ public class Server {
private final StorageRegistry storageRegistry = StorageRegistry.get();
private final BlockRegistry blockRegistry = BlockRegistry.get();
private final BlockEntityRegistry blockEntityRegistry = BlockEntityRegistry.get();
private final ItemRegistry itemRegistry = ItemRegistry.get();
private final CloudItemRegistry itemRegistry = CloudItemRegistry.get();
private final EntityRegistry entityRegistry = EntityRegistry.get();
private final BiomeRegistry biomeRegistry = BiomeRegistry.get();
private final CommandRegistry commandRegistry = CommandRegistry.get();
Expand Down Expand Up @@ -1800,8 +1800,8 @@ private void loadPacks() {
}

private void registerVanillaComponents() {
Enchantment.init();
Item.initCreativeItems();
CloudEnchantmentInstance.init();
ItemStack.initCreativeItems();
Effect.init();
Potion.init();
Attribute.init();
Expand Down
Loading