Begin remigrate to Shiroha
uhm
This commit is contained in:
@@ -113,9 +113,9 @@ index f22b5fdec6da8bcff9aef3d9fed5dbe61d39250a..336a1ae13810207696a699a936d4031e
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
+ // Camellia start - Add status bars
|
||||
+ // Shiroha start - Add status bars
|
||||
+ this.statusBarList.tick();
|
||||
+ // Camellia end - Add status bars
|
||||
+ // Shiroha end - Add status bars
|
||||
// CraftBukkit start
|
||||
if (this.joining) {
|
||||
this.joining = false;
|
||||
@@ -253,7 +253,7 @@ index 2eb5fc819e2e17c69de87f8aa1a99e02bc5a62d5..ab0f42c6ed9ba4f920eefba4d1449ded
|
||||
private ItemStack lastItemInMainHand = ItemStack.EMPTY;
|
||||
private final ItemCooldowns cooldowns = this.createItemCooldowns();
|
||||
private Optional<GlobalPos> lastDeathLocation = Optional.empty();
|
||||
+ public moe.monnairealms.camellia.functions.bars.TickableStatusBarList statusBarList = new moe.monnairealms.camellia.functions.bars.TickableStatusBarList(this); // Camellia - Add status bars
|
||||
+ public moe.monnairealms.camellia.functions.bars.TickableStatusBarList statusBarList = new moe.monnairealms.camellia.functions.bars.TickableStatusBarList(this); // Shiroha - Add status bars
|
||||
public @Nullable FishingHook fishing;
|
||||
public float hurtDir;
|
||||
public boolean affectsSpawning = true; // Paper - Affects Spawning API
|
||||
@@ -261,7 +261,7 @@ index 2eb5fc819e2e17c69de87f8aa1a99e02bc5a62d5..ab0f42c6ed9ba4f920eefba4d1449ded
|
||||
this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(this.abilities.getWalkingSpeed());
|
||||
this.enderChestInventory.fromSlots(input.listOrEmpty("EnderItems", ItemStackWithSlot.CODEC));
|
||||
this.setLastDeathLocation(input.read("LastDeathLocation", GlobalPos.CODEC));
|
||||
+ this.statusBarList.load(input); // Camellia - Add status bars
|
||||
+ this.statusBarList.load(input); // Shiroha - Add status bars
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -269,7 +269,7 @@ index 2eb5fc819e2e17c69de87f8aa1a99e02bc5a62d5..ab0f42c6ed9ba4f920eefba4d1449ded
|
||||
output.store("abilities", Abilities.Packed.CODEC, this.abilities.pack());
|
||||
this.enderChestInventory.storeAsSlots(output.list("EnderItems", ItemStackWithSlot.CODEC));
|
||||
this.lastDeathLocation.ifPresent(pos -> output.store("LastDeathLocation", GlobalPos.CODEC, pos));
|
||||
+ this.statusBarList.save(output); // Camellia - Add status bars
|
||||
+ this.statusBarList.save(output); // Shiroha - Add status bars
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user