Some cleanup
This commit is contained in:
parent
5f17127ba5
commit
a2acd50658
3 changed files with 2 additions and 20 deletions
|
@ -147,24 +147,8 @@ public abstract class DataHandler extends BaseDataHandler {
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
abstract protected void serializeDataOnClient(FriendlyByteBuf buf);
|
abstract protected void serializeDataOnClient(FriendlyByteBuf buf);
|
||||||
|
|
||||||
@Deprecated(forRemoval = true)
|
protected abstract void deserializeIncomingDataOnServer(FriendlyByteBuf buf, Player player, PacketSender responseSender);
|
||||||
protected void deserializeIncomingDataOnServer(FriendlyByteBuf buf, PacketSender responseSender){ }
|
protected abstract void runOnServerGameThread(MinecraftServer server, Player player);
|
||||||
|
|
||||||
//TODO: should be abstract once deserializeIncomingDataOnServer(FriendlyByteBuf buf, PacketSender responseSender) was removed
|
|
||||||
|
|
||||||
protected void deserializeIncomingDataOnServer(FriendlyByteBuf buf, Player player, PacketSender responseSender) {
|
|
||||||
deserializeIncomingDataOnServer(buf, responseSender);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
protected void runOnServerGameThread(MinecraftServer server){ }
|
|
||||||
|
|
||||||
|
|
||||||
//TODO: should be abstract once runOnServerGameThread(MinecraftServer server) was removed
|
|
||||||
protected void runOnServerGameThread(MinecraftServer server, Player player){
|
|
||||||
runOnServerGameThread(server);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -127,7 +127,6 @@ public class SendFiles extends DataHandler.FromServer {
|
||||||
if ( Configs.CLIENT_CONFIG.isAcceptingConfigs() || Configs.CLIENT_CONFIG.isAcceptingFiles() || Configs.CLIENT_CONFIG.isAcceptingMods()) {
|
if ( Configs.CLIENT_CONFIG.isAcceptingConfigs() || Configs.CLIENT_CONFIG.isAcceptingFiles() || Configs.CLIENT_CONFIG.isAcceptingMods()) {
|
||||||
BCLib.LOGGER.info("Writing Files:");
|
BCLib.LOGGER.info("Writing Files:");
|
||||||
|
|
||||||
//TODO: Reject files that were not in the last RequestFiles.
|
|
||||||
for (Pair<AutoFileSyncEntry, byte[]> entry : receivedFiles) {
|
for (Pair<AutoFileSyncEntry, byte[]> entry : receivedFiles) {
|
||||||
final AutoFileSyncEntry e = entry.first;
|
final AutoFileSyncEntry e = entry.first;
|
||||||
final byte[] data = entry.second;
|
final byte[] data = entry.second;
|
||||||
|
|
|
@ -35,7 +35,6 @@ public class TagAPI {
|
||||||
* @return {@link TagKey}.
|
* @return {@link TagKey}.
|
||||||
*/
|
*/
|
||||||
public static <T> TagKey<T> makeTag(Registry<T> registry, TagLocation<T> id) {
|
public static <T> TagKey<T> makeTag(Registry<T> registry, TagLocation<T> id) {
|
||||||
//TODO: 1.18.2 check if registry.key() gets the correct result
|
|
||||||
return registry
|
return registry
|
||||||
.getTagNames()
|
.getTagNames()
|
||||||
.filter(tagKey -> tagKey.location().equals(id))
|
.filter(tagKey -> tagKey.location().equals(id))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue