Skip to content

Add history and lookup command (DONT USE) #38

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
NgLoader wants to merge 1 commit into from
Closed

Add history and lookup command (DONT USE) #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions zip-api/src/main/java/net/imprex/zip/api/ZIPBackpack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package net.imprex.zip.api;

import java.time.OffsetDateTime;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;

import net.imprex.zip.api.ZIPBackpackHistory.HistoryConsumer;

public interface ZIPBackpack {

void save();
Expand All @@ -20,6 +27,22 @@ public interface ZIPBackpack {

boolean giveUnsueableContent(Player player);

List<ZIPBackpackHistory> getHistroy();

void computeHistory(UUID uuid, OffsetDateTime dateTime, HistoryConsumer consumer);

default void computeHistory(UUID uuid, HistoryConsumer consumer) {
this.computeHistory(uuid, OffsetDateTime.now(), consumer);
}

void addHistory(UUID uuid, OffsetDateTime dateTime, Map<ItemStack, Integer> items);

default void addHistory(UUID uuid, Map<ItemStack, Integer> items) {
this.addHistory(uuid, OffsetDateTime.now(), items);
}

void clearHistory();

boolean isValid();

Inventory getInventory();
Expand Down
21 changes: 21 additions & 0 deletions zip-api/src/main/java/net/imprex/zip/api/ZIPBackpackHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package net.imprex.zip.api;

import java.time.OffsetDateTime;
import java.util.Map;
import java.util.UUID;

import org.bukkit.inventory.ItemStack;

public interface ZIPBackpackHistory {

UUID player();

OffsetDateTime dateTime();

Map<ItemStack, Integer> items();

public static interface HistoryConsumer {

void consume();
}
}
21 changes: 21 additions & 0 deletions zip-common/src/main/java/net/imprex/zip/common/Ingrim4Buffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import java.nio.channels.ScatteringByteChannel;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.UUID;

import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
Expand Down Expand Up @@ -99,6 +103,23 @@ public void writeString(String value) {
this.buf.writeBytes(bytes);
}

public UUID readUUID() {
return new UUID(this.buf.readLong(), this.buf.readLong());
}

public void writeUUID(UUID uuid) {
this.buf.writeLong(uuid.getMostSignificantBits());
this.buf.writeLong(uuid.getLeastSignificantBits());
}

public OffsetDateTime readDateTime() {
return OffsetDateTime.ofInstant(Instant.ofEpochSecond(this.buf.readLong()), ZoneOffset.UTC);
}

public void writeDateTime(OffsetDateTime dateTime) {
this.buf.writeLong(dateTime.toEpochSecond());
}

/**
* Reads a byte array which got write byte {@link Ingrim4Buffer#writeByteArray(byte[])}
* @return byte[]
Expand Down
22 changes: 17 additions & 5 deletions zip-common/src/main/java/net/imprex/zip/common/UniqueId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright © 2014 - 2021 Leipzig University (Database Research Group)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @see https://github.com/dbs-leipzig/gradoop/blob/develop/gradoop-common/src/main/java/org/gradoop/common/model/impl/id/GradoopId.java
*/
package net.imprex.zip.common;

import java.net.NetworkInterface;
Expand All @@ -11,11 +28,6 @@

import net.imprex.zip.api.ZIPUniqueId;

/**
*
* @author dbs-leipzig
* @see https://github.com/dbs-leipzig/gradoop/blob/develop/gradoop-common/src/main/java/org/gradoop/common/model/impl/id/ScriptedItemId.java
*/
public class UniqueId implements Comparable<UniqueId>, ZIPUniqueId {

/**
Expand Down
8 changes: 6 additions & 2 deletions zip-nms/zip-nms-api/src/main/java/net/imprex/zip/nms/api/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@

public interface NmsManager {

byte[] itemstackToBinary(ItemStack[] items);
byte[] itemstackArrayToBinary(ItemStack[] items);

List<ItemStack> binaryToItemStack(byte[] binary);
List<ItemStack> binaryToItemStackArray(byte[] binary);

byte[] itemstackToBinary(ItemStack item);

ItemStack binaryToItemStack(byte[] binary);

void setSkullProfile(SkullMeta meta, String texture);

Expand Down
17 changes: 15 additions & 2 deletions zip-nms/zip-nms-v1_19_R1/src/main/java/net/imprex/zip/nms/v1_19_R1/ZipNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public CompoundTag binaryToNBT(byte[] binary) {
}

@Override
public byte[] itemstackToBinary(ItemStack[] items) {
public byte[] itemstackArrayToBinary(ItemStack[] items) {
CompoundTag inventory = new CompoundTag();
ListTag list = new ListTag();
for (ItemStack itemStack : items) {
Expand All @@ -60,7 +60,7 @@ public byte[] itemstackToBinary(ItemStack[] items) {
}

@Override
public List<ItemStack> binaryToItemStack(byte[] binary) {
public List<ItemStack> binaryToItemStackArray(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
List<ItemStack> items = new ArrayList<>();
if (nbt.contains("i", 9)) {
Expand All @@ -74,6 +74,19 @@ public List<ItemStack> binaryToItemStack(byte[] binary) {
return items;
}

@Override
public byte[] itemstackToBinary(ItemStack item) {
net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(item);
CompoundTag tag = craftItem.save(new CompoundTag());
return nbtToBinary(tag);
}

@Override
public ItemStack binaryToItemStack(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
return CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(nbt));
}

@Override
public void setSkullProfile(SkullMeta meta, String texture) {
try {
Expand Down
17 changes: 15 additions & 2 deletions zip-nms/zip-nms-v1_19_R2/src/main/java/net/imprex/zip/nms/v1_19_R2/ZipNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public CompoundTag binaryToNBT(byte[] binary) {
}

@Override
public byte[] itemstackToBinary(ItemStack[] items) {
public byte[] itemstackArrayToBinary(ItemStack[] items) {
CompoundTag inventory = new CompoundTag();
ListTag list = new ListTag();
for (ItemStack itemStack : items) {
Expand All @@ -60,7 +60,7 @@ public byte[] itemstackToBinary(ItemStack[] items) {
}

@Override
public List<ItemStack> binaryToItemStack(byte[] binary) {
public List<ItemStack> binaryToItemStackArray(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
List<ItemStack> items = new ArrayList<>();
if (nbt.contains("i", 9)) {
Expand All @@ -74,6 +74,19 @@ public List<ItemStack> binaryToItemStack(byte[] binary) {
return items;
}

@Override
public byte[] itemstackToBinary(ItemStack item) {
net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(item);
CompoundTag tag = craftItem.save(new CompoundTag());
return nbtToBinary(tag);
}

@Override
public ItemStack binaryToItemStack(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
return CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(nbt));
}

@Override
public void setSkullProfile(SkullMeta meta, String texture) {
try {
Expand Down
17 changes: 15 additions & 2 deletions zip-nms/zip-nms-v1_19_R3/src/main/java/net/imprex/zip/nms/v1_19_R3/ZipNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public CompoundTag binaryToNBT(byte[] binary) {
}

@Override
public byte[] itemstackToBinary(ItemStack[] items) {
public byte[] itemstackArrayToBinary(ItemStack[] items) {
CompoundTag inventory = new CompoundTag();
ListTag list = new ListTag();
for (ItemStack itemStack : items) {
Expand All @@ -60,7 +60,7 @@ public byte[] itemstackToBinary(ItemStack[] items) {
}

@Override
public List<ItemStack> binaryToItemStack(byte[] binary) {
public List<ItemStack> binaryToItemStackArray(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
List<ItemStack> items = new ArrayList<>();
if (nbt.contains("i", 9)) {
Expand All @@ -74,6 +74,19 @@ public List<ItemStack> binaryToItemStack(byte[] binary) {
return items;
}

@Override
public byte[] itemstackToBinary(ItemStack item) {
net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(item);
CompoundTag tag = craftItem.save(new CompoundTag());
return nbtToBinary(tag);
}

@Override
public ItemStack binaryToItemStack(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
return CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(nbt));
}

@Override
public void setSkullProfile(SkullMeta meta, String texture) {
try {
Expand Down
17 changes: 15 additions & 2 deletions zip-nms/zip-nms-v1_20_R1/src/main/java/net/imprex/zip/nms/v1_20_R1/ZipNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public CompoundTag binaryToNBT(byte[] binary) {
}

@Override
public byte[] itemstackToBinary(ItemStack[] items) {
public byte[] itemstackArrayToBinary(ItemStack[] items) {
CompoundTag inventory = new CompoundTag();
ListTag list = new ListTag();
for (ItemStack itemStack : items) {
Expand All @@ -60,7 +60,7 @@ public byte[] itemstackToBinary(ItemStack[] items) {
}

@Override
public List<ItemStack> binaryToItemStack(byte[] binary) {
public List<ItemStack> binaryToItemStackArray(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
List<ItemStack> items = new ArrayList<>();
if (nbt.contains("i", 9)) {
Expand All @@ -74,6 +74,19 @@ public List<ItemStack> binaryToItemStack(byte[] binary) {
return items;
}

@Override
public byte[] itemstackToBinary(ItemStack item) {
net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(item);
CompoundTag tag = craftItem.save(new CompoundTag());
return nbtToBinary(tag);
}

@Override
public ItemStack binaryToItemStack(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
return CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(nbt));
}

@Override
public void setSkullProfile(SkullMeta meta, String texture) {
try {
Expand Down
17 changes: 15 additions & 2 deletions zip-nms/zip-nms-v1_20_R2/src/main/java/net/imprex/zip/nms/v1_20_R2/ZipNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public CompoundTag binaryToNBT(byte[] binary) {
}

@Override
public byte[] itemstackToBinary(ItemStack[] items) {
public byte[] itemstackArrayToBinary(ItemStack[] items) {
CompoundTag inventory = new CompoundTag();
ListTag list = new ListTag();
for (ItemStack itemStack : items) {
Expand All @@ -60,7 +60,7 @@ public byte[] itemstackToBinary(ItemStack[] items) {
}

@Override
public List<ItemStack> binaryToItemStack(byte[] binary) {
public List<ItemStack> binaryToItemStackArray(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
List<ItemStack> items = new ArrayList<>();
if (nbt.contains("i", 9)) {
Expand All @@ -74,6 +74,19 @@ public List<ItemStack> binaryToItemStack(byte[] binary) {
return items;
}

@Override
public byte[] itemstackToBinary(ItemStack item) {
net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(item);
CompoundTag tag = craftItem.save(new CompoundTag());
return nbtToBinary(tag);
}

@Override
public ItemStack binaryToItemStack(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
return CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(nbt));
}

@Override
public void setSkullProfile(SkullMeta meta, String texture) {
try {
Expand Down
17 changes: 15 additions & 2 deletions zip-nms/zip-nms-v1_20_R3/src/main/java/net/imprex/zip/nms/v1_20_R3/ZipNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public CompoundTag binaryToNBT(byte[] binary) {
}

@Override
public byte[] itemstackToBinary(ItemStack[] items) {
public byte[] itemstackArrayToBinary(ItemStack[] items) {
CompoundTag inventory = new CompoundTag();
ListTag list = new ListTag();
for (ItemStack itemStack : items) {
Expand All @@ -61,7 +61,7 @@ public byte[] itemstackToBinary(ItemStack[] items) {
}

@Override
public List<ItemStack> binaryToItemStack(byte[] binary) {
public List<ItemStack> binaryToItemStackArray(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
List<ItemStack> items = new ArrayList<>();
if (nbt.contains("i", 9)) {
Expand All @@ -75,6 +75,19 @@ public List<ItemStack> binaryToItemStack(byte[] binary) {
return items;
}

@Override
public byte[] itemstackToBinary(ItemStack item) {
net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(item);
CompoundTag tag = craftItem.save(new CompoundTag());
return nbtToBinary(tag);
}

@Override
public ItemStack binaryToItemStack(byte[] binary) {
CompoundTag nbt = binaryToNBT(binary);
return CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(nbt));
}

@Override
public void setSkullProfile(SkullMeta meta, String texture) {
try {
Expand Down
Loading
Loading