Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
Remove UserCache import as it is used now.
Dieser Commit ist enthalten in:
md_5
Zach Brown
Ursprung
55b35d8a6f
Commit
f5e295d087
@ -1,4 +1,4 @@
|
||||
From 68660010d2f0ede16bb79d23a7d2b45780152cbf Mon Sep 17 00:00:00 2001
|
||||
From e38edc080646fbffb49e6f6ea44f3c4d89a21b08 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 1 Dec 2013 15:10:48 +1100
|
||||
Subject: [PATCH] mc-dev imports
|
||||
@ -4292,350 +4292,6 @@ index 0000000..0bced98
|
||||
+
|
||||
+ protected abstract StructureStart b(int i, int j);
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
||||
new file mode 100644
|
||||
index 0000000..78f1f57
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
||||
@@ -0,0 +1,338 @@
|
||||
+package net.minecraft.server;
|
||||
+
|
||||
+import com.google.common.base.Charsets;
|
||||
+import com.google.common.collect.Iterators;
|
||||
+import com.google.common.collect.Lists;
|
||||
+import com.google.common.collect.Maps;
|
||||
+import com.google.common.io.Files;
|
||||
+import com.google.gson.Gson;
|
||||
+import com.google.gson.GsonBuilder;
|
||||
+import com.google.gson.JsonDeserializationContext;
|
||||
+import com.google.gson.JsonDeserializer;
|
||||
+import com.google.gson.JsonElement;
|
||||
+import com.google.gson.JsonObject;
|
||||
+import com.google.gson.JsonParseException;
|
||||
+import com.google.gson.JsonSerializationContext;
|
||||
+import com.google.gson.JsonSerializer;
|
||||
+import com.mojang.authlib.Agent;
|
||||
+import com.mojang.authlib.GameProfile;
|
||||
+import com.mojang.authlib.ProfileLookupCallback;
|
||||
+import java.io.BufferedReader;
|
||||
+import java.io.BufferedWriter;
|
||||
+import java.io.File;
|
||||
+import java.io.FileNotFoundException;
|
||||
+import java.io.IOException;
|
||||
+import java.lang.reflect.ParameterizedType;
|
||||
+import java.lang.reflect.Type;
|
||||
+import java.text.ParseException;
|
||||
+import java.text.SimpleDateFormat;
|
||||
+import java.util.ArrayList;
|
||||
+import java.util.Calendar;
|
||||
+import java.util.Date;
|
||||
+import java.util.Iterator;
|
||||
+import java.util.LinkedList;
|
||||
+import java.util.List;
|
||||
+import java.util.Locale;
|
||||
+import java.util.Map;
|
||||
+import java.util.UUID;
|
||||
+import org.apache.commons.io.IOUtils;
|
||||
+
|
||||
+public class UserCache {
|
||||
+
|
||||
+ public static final SimpleDateFormat a = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
|
||||
+ private final Map<String, UserCache.UserCacheEntry> c = Maps.newHashMap();
|
||||
+ private final Map<UUID, UserCache.UserCacheEntry> d = Maps.newHashMap();
|
||||
+ private final LinkedList<GameProfile> e = Lists.newLinkedList();
|
||||
+ private final MinecraftServer f;
|
||||
+ protected final Gson b;
|
||||
+ private final File g;
|
||||
+ private static final ParameterizedType h = new ParameterizedType() {
|
||||
+ public Type[] getActualTypeArguments() {
|
||||
+ return new Type[] { UserCache.UserCacheEntry.class};
|
||||
+ }
|
||||
+
|
||||
+ public Type getRawType() {
|
||||
+ return List.class;
|
||||
+ }
|
||||
+
|
||||
+ public Type getOwnerType() {
|
||||
+ return null;
|
||||
+ }
|
||||
+ };
|
||||
+
|
||||
+ public UserCache(MinecraftServer minecraftserver, File file) {
|
||||
+ this.f = minecraftserver;
|
||||
+ this.g = file;
|
||||
+ GsonBuilder gsonbuilder = new GsonBuilder();
|
||||
+
|
||||
+ gsonbuilder.registerTypeHierarchyAdapter(UserCache.UserCacheEntry.class, new UserCache.BanEntrySerializer(null));
|
||||
+ this.b = gsonbuilder.create();
|
||||
+ this.b();
|
||||
+ }
|
||||
+
|
||||
+ private static GameProfile a(MinecraftServer minecraftserver, String s) {
|
||||
+ final GameProfile[] agameprofile = new GameProfile[1];
|
||||
+ ProfileLookupCallback profilelookupcallback = new ProfileLookupCallback() {
|
||||
+ public void onProfileLookupSucceeded(GameProfile gameprofile) {
|
||||
+ agameprofile[0] = gameprofile;
|
||||
+ }
|
||||
+
|
||||
+ public void onProfileLookupFailed(GameProfile gameprofile, Exception exception) {
|
||||
+ agameprofile[0] = null;
|
||||
+ }
|
||||
+ };
|
||||
+
|
||||
+ minecraftserver.getGameProfileRepository().findProfilesByNames(new String[] { s}, Agent.MINECRAFT, profilelookupcallback);
|
||||
+ if (!minecraftserver.getOnlineMode() && agameprofile[0] == null) {
|
||||
+ UUID uuid = EntityHuman.a(new GameProfile((UUID) null, s));
|
||||
+ GameProfile gameprofile = new GameProfile(uuid, s);
|
||||
+
|
||||
+ profilelookupcallback.onProfileLookupSucceeded(gameprofile);
|
||||
+ }
|
||||
+
|
||||
+ return agameprofile[0];
|
||||
+ }
|
||||
+
|
||||
+ public void a(GameProfile gameprofile) {
|
||||
+ this.a(gameprofile, (Date) null);
|
||||
+ }
|
||||
+
|
||||
+ private void a(GameProfile gameprofile, Date date) {
|
||||
+ UUID uuid = gameprofile.getId();
|
||||
+
|
||||
+ if (date == null) {
|
||||
+ Calendar calendar = Calendar.getInstance();
|
||||
+
|
||||
+ calendar.setTime(new Date());
|
||||
+ calendar.add(2, 1);
|
||||
+ date = calendar.getTime();
|
||||
+ }
|
||||
+
|
||||
+ String s = gameprofile.getName().toLowerCase(Locale.ROOT);
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = new UserCache.UserCacheEntry(gameprofile, date, null);
|
||||
+
|
||||
+ if (this.d.containsKey(uuid)) {
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry1 = (UserCache.UserCacheEntry) this.d.get(uuid);
|
||||
+
|
||||
+ this.c.remove(usercache_usercacheentry1.a().getName().toLowerCase(Locale.ROOT));
|
||||
+ this.e.remove(gameprofile);
|
||||
+ }
|
||||
+
|
||||
+ this.c.put(gameprofile.getName().toLowerCase(Locale.ROOT), usercache_usercacheentry);
|
||||
+ this.d.put(uuid, usercache_usercacheentry);
|
||||
+ this.e.addFirst(gameprofile);
|
||||
+ this.c();
|
||||
+ }
|
||||
+
|
||||
+ public GameProfile getProfile(String s) {
|
||||
+ String s1 = s.toLowerCase(Locale.ROOT);
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.c.get(s1);
|
||||
+
|
||||
+ if (usercache_usercacheentry != null && (new Date()).getTime() >= usercache_usercacheentry.c.getTime()) {
|
||||
+ this.d.remove(usercache_usercacheentry.a().getId());
|
||||
+ this.c.remove(usercache_usercacheentry.a().getName().toLowerCase(Locale.ROOT));
|
||||
+ this.e.remove(usercache_usercacheentry.a());
|
||||
+ usercache_usercacheentry = null;
|
||||
+ }
|
||||
+
|
||||
+ GameProfile gameprofile;
|
||||
+
|
||||
+ if (usercache_usercacheentry != null) {
|
||||
+ gameprofile = usercache_usercacheentry.a();
|
||||
+ this.e.remove(gameprofile);
|
||||
+ this.e.addFirst(gameprofile);
|
||||
+ } else {
|
||||
+ gameprofile = a(this.f, s1);
|
||||
+ if (gameprofile != null) {
|
||||
+ this.a(gameprofile);
|
||||
+ usercache_usercacheentry = (UserCache.UserCacheEntry) this.c.get(s1);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ this.c();
|
||||
+ return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
|
||||
+ }
|
||||
+
|
||||
+ public String[] a() {
|
||||
+ ArrayList arraylist = Lists.newArrayList(this.c.keySet());
|
||||
+
|
||||
+ return (String[]) arraylist.toArray(new String[arraylist.size()]);
|
||||
+ }
|
||||
+
|
||||
+ public GameProfile a(UUID uuid) {
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.d.get(uuid);
|
||||
+
|
||||
+ return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
|
||||
+ }
|
||||
+
|
||||
+ private UserCache.UserCacheEntry b(UUID uuid) {
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.d.get(uuid);
|
||||
+
|
||||
+ if (usercache_usercacheentry != null) {
|
||||
+ GameProfile gameprofile = usercache_usercacheentry.a();
|
||||
+
|
||||
+ this.e.remove(gameprofile);
|
||||
+ this.e.addFirst(gameprofile);
|
||||
+ }
|
||||
+
|
||||
+ return usercache_usercacheentry;
|
||||
+ }
|
||||
+
|
||||
+ public void b() {
|
||||
+ BufferedReader bufferedreader = null;
|
||||
+
|
||||
+ try {
|
||||
+ bufferedreader = Files.newReader(this.g, Charsets.UTF_8);
|
||||
+ List list = (List) this.b.fromJson(bufferedreader, UserCache.h);
|
||||
+
|
||||
+ this.c.clear();
|
||||
+ this.d.clear();
|
||||
+ this.e.clear();
|
||||
+ Iterator iterator = Lists.reverse(list).iterator();
|
||||
+
|
||||
+ while (iterator.hasNext()) {
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) iterator.next();
|
||||
+
|
||||
+ if (usercache_usercacheentry != null) {
|
||||
+ this.a(usercache_usercacheentry.a(), usercache_usercacheentry.b());
|
||||
+ }
|
||||
+ }
|
||||
+ } catch (FileNotFoundException filenotfoundexception) {
|
||||
+ ;
|
||||
+ } catch (JsonParseException jsonparseexception) {
|
||||
+ ;
|
||||
+ } finally {
|
||||
+ IOUtils.closeQuietly(bufferedreader);
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ public void c() {
|
||||
+ String s = this.b.toJson(this.a(1000));
|
||||
+ BufferedWriter bufferedwriter = null;
|
||||
+
|
||||
+ try {
|
||||
+ bufferedwriter = Files.newWriter(this.g, Charsets.UTF_8);
|
||||
+ bufferedwriter.write(s);
|
||||
+ return;
|
||||
+ } catch (FileNotFoundException filenotfoundexception) {
|
||||
+ return;
|
||||
+ } catch (IOException ioexception) {
|
||||
+ ;
|
||||
+ } finally {
|
||||
+ IOUtils.closeQuietly(bufferedwriter);
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ private List<UserCache.UserCacheEntry> a(int i) {
|
||||
+ ArrayList arraylist = Lists.newArrayList();
|
||||
+ ArrayList arraylist1 = Lists.newArrayList(Iterators.limit(this.e.iterator(), i));
|
||||
+ Iterator iterator = arraylist1.iterator();
|
||||
+
|
||||
+ while (iterator.hasNext()) {
|
||||
+ GameProfile gameprofile = (GameProfile) iterator.next();
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = this.b(gameprofile.getId());
|
||||
+
|
||||
+ if (usercache_usercacheentry != null) {
|
||||
+ arraylist.add(usercache_usercacheentry);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return arraylist;
|
||||
+ }
|
||||
+
|
||||
+ class UserCacheEntry {
|
||||
+
|
||||
+ private final GameProfile b;
|
||||
+ private final Date c;
|
||||
+
|
||||
+ private UserCacheEntry(GameProfile gameprofile, Date date) {
|
||||
+ this.b = gameprofile;
|
||||
+ this.c = date;
|
||||
+ }
|
||||
+
|
||||
+ public GameProfile a() {
|
||||
+ return this.b;
|
||||
+ }
|
||||
+
|
||||
+ public Date b() {
|
||||
+ return this.c;
|
||||
+ }
|
||||
+
|
||||
+ UserCacheEntry(GameProfile gameprofile, Date date, Object object) {
|
||||
+ this(gameprofile, date);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ class BanEntrySerializer implements JsonDeserializer<UserCache.UserCacheEntry>, JsonSerializer<UserCache.UserCacheEntry> {
|
||||
+
|
||||
+ private BanEntrySerializer() {}
|
||||
+
|
||||
+ public JsonElement a(UserCache.UserCacheEntry usercache_usercacheentry, Type type, JsonSerializationContext jsonserializationcontext) {
|
||||
+ JsonObject jsonobject = new JsonObject();
|
||||
+
|
||||
+ jsonobject.addProperty("name", usercache_usercacheentry.a().getName());
|
||||
+ UUID uuid = usercache_usercacheentry.a().getId();
|
||||
+
|
||||
+ jsonobject.addProperty("uuid", uuid == null ? "" : uuid.toString());
|
||||
+ jsonobject.addProperty("expiresOn", UserCache.a.format(usercache_usercacheentry.b()));
|
||||
+ return jsonobject;
|
||||
+ }
|
||||
+
|
||||
+ public UserCache.UserCacheEntry a(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
|
||||
+ if (jsonelement.isJsonObject()) {
|
||||
+ JsonObject jsonobject = jsonelement.getAsJsonObject();
|
||||
+ JsonElement jsonelement1 = jsonobject.get("name");
|
||||
+ JsonElement jsonelement2 = jsonobject.get("uuid");
|
||||
+ JsonElement jsonelement3 = jsonobject.get("expiresOn");
|
||||
+
|
||||
+ if (jsonelement1 != null && jsonelement2 != null) {
|
||||
+ String s = jsonelement2.getAsString();
|
||||
+ String s1 = jsonelement1.getAsString();
|
||||
+ Date date = null;
|
||||
+
|
||||
+ if (jsonelement3 != null) {
|
||||
+ try {
|
||||
+ date = UserCache.a.parse(jsonelement3.getAsString());
|
||||
+ } catch (ParseException parseexception) {
|
||||
+ date = null;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (s1 != null && s != null) {
|
||||
+ UUID uuid;
|
||||
+
|
||||
+ try {
|
||||
+ uuid = UUID.fromString(s);
|
||||
+ } catch (Throwable throwable) {
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ UserCache.UserCacheEntry usercache_usercacheentry = UserCache.this.new UserCacheEntry(new GameProfile(uuid, s1), date, null);
|
||||
+
|
||||
+ return usercache_usercacheentry;
|
||||
+ } else {
|
||||
+ return null;
|
||||
+ }
|
||||
+ } else {
|
||||
+ return null;
|
||||
+ }
|
||||
+ } else {
|
||||
+ return null;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ public JsonElement serialize(UserCache.UserCacheEntry object, Type type, JsonSerializationContext jsonserializationcontext) {
|
||||
+ return this.a((UserCache.UserCacheEntry) object, type, jsonserializationcontext);
|
||||
+ }
|
||||
+
|
||||
+ public UserCache.UserCacheEntry deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
|
||||
+ return this.a(jsonelement, type, jsondeserializationcontext);
|
||||
+ }
|
||||
+
|
||||
+ BanEntrySerializer(Object object) {
|
||||
+ this();
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldGenForestTree.java b/src/main/java/net/minecraft/server/WorldGenForestTree.java
|
||||
new file mode 100644
|
||||
index 0000000..ffbc47d
|
||||
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren