LexManos
commented
3 years ago Pulled in the mask fix in https://github.com/MinecraftForge/ForgeFlower/commit/e66101393ee59b98a08502955df8c40bda1c6038 We'll need to discuss the other parts more.
Open zml2008 opened 3 years ago
LexManos
commented
3 years ago Pulled in the mask fix in https://github.com/MinecraftForge/ForgeFlower/commit/e66101393ee59b98a08502955df8c40bda1c6038 We'll need to discuss the other parts more.
SizableShrimp
commented
1 year ago Awaiting discussion & rebasing.
Broken out of #96
It appears that a lot of inner classes have gained a Signature attribute, which causes generic signature processing to activate. This exposed some issues in its handling of synthetic constructor parameters, which I think I've taken care of enough to correctly
(not sure how these changes would react if someone disabled enum handling though)
Comparisons (via VanillaGradle)
1.16.5
```patch diff -r -u3 -N a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java --- a/net/minecraft/world/entity/animal/Wolf.java 2021-04-25 19:34:12.000000000 -0700 +++ b/net/minecraft/world/entity/animal/Wolf.java 2021-05-26 20:44:06.000000000 -0700 @@ -89,7 +89,7 @@ protected void registerGoals() { this.goalSelector.addGoal(1, new FloatGoal(this)); this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this)); - this.goalSelector.addGoal(3, new Wolf.WolfAvoidEntityGoal(this, Llama.class, 24.0F, 1.5D, 1.5D)); + this.goalSelector.addGoal(3, new Wolf.WolfAvoidEntityGoal<>(this, Llama.class, 24.0F, 1.5D, 1.5D)); this.goalSelector.addGoal(4, new LeapAtTargetGoal(this, 0.4F)); this.goalSelector.addGoal(5, new MeleeAttackGoal(this, 1.0D, true)); this.goalSelector.addGoal(6, new FollowOwnerGoal(this, 1.0D, 10.0F, 2.0F, false)); ``` note: There are some new warnings in the decompiler output here, which appear to be classes where PG has stripped the constructor. This is due to the change to now calculate synthetic parameter masks for inner classes that are marked `static`. This change is required because starting with 21w19a, Mojang's tooling has corrupted Minecraft's inner class metadata and made some non-static inner classes be marked as static. The warnings: ``` pool-2-thread-3: WARN: Nested class net/minecraft/world/level/levelgen/feature/configurations/OreConfiguration$Predicates has no constructor! pool-2-thread-14: WARN: Nested class net/minecraft/nbt/IntTag$Cache has no constructor! pool-2-thread-9: WARN: Nested class net/minecraft/nbt/LongTag$Cache has no constructor! pool-2-thread-10: WARN: Nested class net/minecraft/nbt/ByteTag$Cache has no constructor! pool-2-thread-8: WARN: Nested class net/minecraft/util/FastColor$ARGB32 has no constructor! pool-2-thread-5: WARN: Nested class net/minecraft/nbt/ShortTag$Cache has no constructor! pool-2-thread-15: WARN: Nested class net/minecraft/data/worldgen/Features$Configs has no constructor! pool-2-thread-15: WARN: Nested class net/minecraft/data/worldgen/Features$Decorators has no constructor! pool-2-thread-15: WARN: Nested class net/minecraft/data/worldgen/Features$States has no constructor! pool-2-thread-9: WARN: Nested class net/minecraft/client/renderer/FaceInfo$Constants has no constructor! ```21w19a
```patch diff -r -u3 -N a/net/minecraft/client/gui/components/CycleButton.java b/net/minecraft/client/gui/components/CycleButton.java --- a/net/minecraft/client/gui/components/CycleButton.java 2021-05-12 08:33:10.000000000 -0700 +++ b/net/minecraft/client/gui/components/CycleButton.java 2021-05-26 20:45:18.000000000 -0700 @@ -215,11 +215,30 @@ Listparam4, CompletableFuture param5) {
- // $FF: Couldn't be decompiled
+ this.resourceManager = param2;
+ this.listenerCount = param3.size();
+ this.startedTaskCounter.incrementAndGet();
+ AtomicInteger var10001 = this.doneTaskCounter;
+ Objects.requireNonNull(this.doneTaskCounter);
+ param5.thenRun(var10001::incrementAndGet);
+ List> var0 = Lists.newArrayList();
+ CompletableFuture var1 = param5;
+ this.preparingListeners = Sets.newHashSet(param3);
+
+ for(final PreparableReloadListener var2 : param3) {
+ final CompletableFuture var3 = var1;
+ CompletableFuture var4 = param4.create(new PreparableReloadListener.PreparationBarrier() { + public CompletableFuture wait(T param0) {
+ param1.execute(() -> {
+ SimpleReloadInstance.this.preparingListeners.remove(var2);
+ if (SimpleReloadInstance.this.preparingListeners.isEmpty()) {
+ SimpleReloadInstance.this.allPreparations.complete(Unit.INSTANCE);
+ }
+
+ });
+ return SimpleReloadInstance.this.allPreparations.thenCombine(var3, (param1x, param2) -> param0);
+ }
+ }, param2, var2, (param1x) -> {
+ this.startedTaskCounter.incrementAndGet();
+ param0.execute(() -> {
+ param1x.run();
+ this.doneTaskCounter.incrementAndGet();
+ });
+ }, (param1x) -> {
+ ++this.startedReloads;
+ param1.execute(() -> {
+ param1x.run();
+ ++this.finishedReloads;
+ });
+ });
+ var0.add(var4);
+ var1 = var4;
+ }
+
+ this.allDone = Util.sequenceFailFast(var0);
}
public CompletableFuture done() {
diff -r -u3 -N a/net/minecraft/server/packs/VanillaPackResources.java b/net/minecraft/server/packs/VanillaPackResources.java
--- a/net/minecraft/server/packs/VanillaPackResources.java 2021-05-12 08:33:04.000000000 -0700
+++ b/net/minecraft/server/packs/VanillaPackResources.java 2021-05-26 20:45:18.000000000 -0700
@@ -7,6 +7,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.io.UncheckedIOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -282,6 +283,43 @@
}
public Resource getResource(final ResourceLocation param0) throws IOException {
- // $FF: Couldn't be decompiled
+ return new Resource() {
+ @Nullable
+ InputStream inputStream;
+
+ public void close() throws IOException {
+ if (this.inputStream != null) {
+ this.inputStream.close();
+ }
+
+ }
+
+ public ResourceLocation getLocation() {
+ return param0;
+ }
+
+ public InputStream getInputStream() {
+ try {
+ this.inputStream = VanillaPackResources.this.getResource(PackType.CLIENT_RESOURCES, param0);
+ } catch (IOException var2) {
+ throw new UncheckedIOException("Could not get client resource from vanilla pack", var2);
+ }
+
+ return this.inputStream;
+ }
+
+ public boolean hasMetadata() {
+ return false;
+ }
+
+ @Nullable
+ public T getMetadata(MetadataSectionSerializer param0x) {
+ return (T)null;
+ }
+
+ public String getSourceName() {
+ return param0.toString();
+ }
+ };
}
}
diff -r -u3 -N a/net/minecraft/server/players/OldUsersConverter.java b/net/minecraft/server/players/OldUsersConverter.java
--- a/net/minecraft/server/players/OldUsersConverter.java 2021-05-12 08:32:54.000000000 -0700
+++ b/net/minecraft/server/players/OldUsersConverter.java 2021-05-26 20:45:18.000000000 -0700
@@ -6,6 +6,7 @@
import com.mojang.authlib.Agent;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.ProfileLookupCallback;
+import com.mojang.authlib.yggdrasil.ProfileNotFoundException;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -61,7 +62,56 @@
}
public static boolean convertUserBanlist(final MinecraftServer param0) {
- // $FF: Couldn't be decompiled
+ final UserBanList var0 = new UserBanList(PlayerList.USERBANLIST_FILE);
+ if (OLD_USERBANLIST.exists() && OLD_USERBANLIST.isFile()) {
+ if (var0.getFile().exists()) {
+ try {
+ var0.load();
+ } catch (IOException var6) {
+ LOGGER.warn("Could not load existing file {}", var0.getFile().getName(), var6);
+ }
+ }
+
+ try {
+ final Map var2 = Maps.newHashMap();
+ readOldListFormat(OLD_USERBANLIST, var2);
+ ProfileLookupCallback var3 = new ProfileLookupCallback() {
+ public void onProfileLookupSucceeded(GameProfile param0x) {
+ param0.getProfileCache().add(param0);
+ String[] var0 = var2.get(param0.getName().toLowerCase(Locale.ROOT));
+ if (var0 == null) {
+ OldUsersConverter.LOGGER.warn("Could not convert user banlist entry for {}", (Object)param0.getName());
+ throw new OldUsersConverter.ConversionError("Profile not in the conversionlist");
+ } else {
+ Date var1 = var0.length > 1 ? OldUsersConverter.parseDate(var0[1], (Date)null) : null;
+ String var2 = var0.length > 2 ? var0[2] : null;
+ Date var3 = var0.length > 3 ? OldUsersConverter.parseDate(var0[3], (Date)null) : null;
+ String var4 = var0.length > 4 ? var0[4] : null;
+ var0.add(new UserBanListEntry(param0, var1, var2, var3, var4));
+ }
+ }
+
+ public void onProfileLookupFailed(GameProfile param0x, Exception param1) {
+ OldUsersConverter.LOGGER.warn("Could not lookup user banlist entry for {}", param0.getName(), param1);
+ if (!(param1 instanceof ProfileNotFoundException)) {
+ throw new OldUsersConverter.ConversionError("Could not request user " + param0.getName() + " from backend systems", param1);
+ }
+ }
+ };
+ lookupPlayers(param0, var2.keySet(), var3);
+ var0.save();
+ renameOldFile(OLD_USERBANLIST);
+ return true;
+ } catch (IOException var4) {
+ LOGGER.warn("Could not read old user banlist to convert it!", (Throwable)var4);
+ return false;
+ } catch (OldUsersConverter.ConversionError var51) {
+ LOGGER.error("Conversion failed, please try again later", (Throwable)var51);
+ return false;
+ }
+ } else {
+ return true;
+ }
}
public static boolean convertIpBanlist(MinecraftServer param0) {
@@ -101,20 +151,197 @@
}
public static boolean convertOpsList(final MinecraftServer param0) {
- // $FF: Couldn't be decompiled
+ final ServerOpList var0 = new ServerOpList(PlayerList.OPLIST_FILE);
+ if (OLD_OPLIST.exists() && OLD_OPLIST.isFile()) {
+ if (var0.getFile().exists()) {
+ try {
+ var0.load();
+ } catch (IOException var6) {
+ LOGGER.warn("Could not load existing file {}", var0.getFile().getName(), var6);
+ }
+ }
+
+ try {
+ List var2 = Files.readLines(OLD_OPLIST, StandardCharsets.UTF_8);
+ ProfileLookupCallback var3 = new ProfileLookupCallback() {
+ public void onProfileLookupSucceeded(GameProfile param0x) {
+ param0.getProfileCache().add(param0);
+ var0.add(new ServerOpListEntry(param0, param0.getOperatorUserPermissionLevel(), false));
+ }
+
+ public void onProfileLookupFailed(GameProfile param0x, Exception param1) {
+ OldUsersConverter.LOGGER.warn("Could not lookup oplist entry for {}", param0.getName(), param1);
+ if (!(param1 instanceof ProfileNotFoundException)) {
+ throw new OldUsersConverter.ConversionError("Could not request user " + param0.getName() + " from backend systems", param1);
+ }
+ }
+ };
+ lookupPlayers(param0, var2, var3);
+ var0.save();
+ renameOldFile(OLD_OPLIST);
+ return true;
+ } catch (IOException var4) {
+ LOGGER.warn("Could not read old oplist to convert it!", (Throwable)var4);
+ return false;
+ } catch (OldUsersConverter.ConversionError var51) {
+ LOGGER.error("Conversion failed, please try again later", (Throwable)var51);
+ return false;
+ }
+ } else {
+ return true;
+ }
}
public static boolean convertWhiteList(final MinecraftServer param0) {
- // $FF: Couldn't be decompiled
+ final UserWhiteList var0 = new UserWhiteList(PlayerList.WHITELIST_FILE);
+ if (OLD_WHITELIST.exists() && OLD_WHITELIST.isFile()) {
+ if (var0.getFile().exists()) {
+ try {
+ var0.load();
+ } catch (IOException var6) {
+ LOGGER.warn("Could not load existing file {}", var0.getFile().getName(), var6);
+ }
+ }
+
+ try {
+ List var2 = Files.readLines(OLD_WHITELIST, StandardCharsets.UTF_8);
+ ProfileLookupCallback var3 = new ProfileLookupCallback() {
+ public void onProfileLookupSucceeded(GameProfile param0x) {
+ param0.getProfileCache().add(param0);
+ var0.add(new UserWhiteListEntry(param0));
+ }
+
+ public void onProfileLookupFailed(GameProfile param0x, Exception param1) {
+ OldUsersConverter.LOGGER.warn("Could not lookup user whitelist entry for {}", param0.getName(), param1);
+ if (!(param1 instanceof ProfileNotFoundException)) {
+ throw new OldUsersConverter.ConversionError("Could not request user " + param0.getName() + " from backend systems", param1);
+ }
+ }
+ };
+ lookupPlayers(param0, var2, var3);
+ var0.save();
+ renameOldFile(OLD_WHITELIST);
+ return true;
+ } catch (IOException var4) {
+ LOGGER.warn("Could not read old whitelist to convert it!", (Throwable)var4);
+ return false;
+ } catch (OldUsersConverter.ConversionError var51) {
+ LOGGER.error("Conversion failed, please try again later", (Throwable)var51);
+ return false;
+ }
+ } else {
+ return true;
+ }
}
@Nullable
public static UUID convertMobOwnerIfNecessary(final MinecraftServer param0, String param1) {
- // $FF: Couldn't be decompiled
+ if (!StringUtil.isNullOrEmpty(param1) && param1.length() <= 16) {
+ GameProfile var1 = param0.getProfileCache().get(param1);
+ if (var1 != null && var1.getId() != null) {
+ return var1.getId();
+ } else if (!param0.isSingleplayer() && param0.usesAuthentication()) {
+ final List var2 = Lists.newArrayList();
+ ProfileLookupCallback var3 = new ProfileLookupCallback() {
+ public void onProfileLookupSucceeded(GameProfile param0x) {
+ param0.getProfileCache().add(param0);
+ var2.add(param0);
+ }
+
+ public void onProfileLookupFailed(GameProfile param0x, Exception param1) {
+ OldUsersConverter.LOGGER.warn("Could not lookup user whitelist entry for {}", param0.getName(), param1);
+ }
+ };
+ lookupPlayers(param0, Lists.newArrayList(param1), var3);
+ return !var2.isEmpty() && var2.get(0).getId() != null ? var2.get(0).getId() : null;
+ } else {
+ return Player.createPlayerUUID(new GameProfile((UUID)null, param1));
+ }
+ } else {
+ try {
+ return UUID.fromString(param1);
+ } catch (IllegalArgumentException var5) {
+ return null;
+ }
+ }
}
public static boolean convertPlayers(final DedicatedServer param0) {
- // $FF: Couldn't be decompiled
+ final File var0 = getWorldPlayersDirectory(param0);
+ final File var1 = new File(var0.getParentFile(), "playerdata");
+ final File var2 = new File(var0.getParentFile(), "unknownplayers");
+ if (var0.exists() && var0.isDirectory()) {
+ File[] var3 = var0.listFiles();
+ List var4 = Lists.newArrayList();
+
+ for(File var5 : var3) {
+ String var6 = var5.getName();
+ if (var6.toLowerCase(Locale.ROOT).endsWith(".dat")) {
+ String var7 = var6.substring(0, var6.length() - ".dat".length());
+ if (!var7.isEmpty()) {
+ var4.add(var7);
+ }
+ }
+ }
+
+ try {
+ final String[] var8 = var4.toArray(new String[var4.size()]);
+ ProfileLookupCallback var9 = new ProfileLookupCallback() {
+ public void onProfileLookupSucceeded(GameProfile param0x) {
+ param0.getProfileCache().add(param0);
+ UUID var0 = param0.getId();
+ if (var0 == null) {
+ throw new OldUsersConverter.ConversionError("Missing UUID for user profile " + param0.getName());
+ } else {
+ this.movePlayerFile(var1, this.getFileNameForProfile(param0), var0.toString());
+ }
+ }
+
+ public void onProfileLookupFailed(GameProfile param0x, Exception param1) {
+ OldUsersConverter.LOGGER.warn("Could not lookup user uuid for {}", param0.getName(), param1);
+ if (param1 instanceof ProfileNotFoundException) {
+ String var0 = this.getFileNameForProfile(param0);
+ this.movePlayerFile(var2, var0, var0);
+ } else {
+ throw new OldUsersConverter.ConversionError("Could not request user " + param0.getName() + " from backend systems", param1);
+ }
+ }
+
+ private void movePlayerFile(File param0x, String param1, String param2) {
+ File var0 = new File(var0, param1 + ".dat");
+ File var1 = new File(param0, param2 + ".dat");
+ OldUsersConverter.ensureDirectoryExists(param0);
+ if (!var0.renameTo(var1)) {
+ throw new OldUsersConverter.ConversionError("Could not convert file for " + param1);
+ }
+ }
+
+ private String getFileNameForProfile(GameProfile param0x) {
+ String var0 = null;
+
+ for(String var1 : var8) {
+ if (var1 != null && var1.equalsIgnoreCase(param0.getName())) {
+ var0 = var1;
+ break;
+ }
+ }
+
+ if (var0 == null) {
+ throw new OldUsersConverter.ConversionError("Could not find the filename for " + param0.getName() + " anymore");
+ } else {
+ return var0;
+ }
+ }
+ };
+ lookupPlayers(param0, Lists.newArrayList(var8), var9);
+ return true;
+ } catch (OldUsersConverter.ConversionError var12) {
+ LOGGER.error("Conversion failed, please try again later", (Throwable)var12);
+ return false;
+ }
+ } else {
+ return true;
+ }
}
static void ensureDirectoryExists(File param0) {
diff -r -u3 -N a/net/minecraft/tags/TagCollection.java b/net/minecraft/tags/TagCollection.java
--- a/net/minecraft/tags/TagCollection.java 2021-05-12 08:32:56.000000000 -0700
+++ b/net/minecraft/tags/TagCollection.java 2021-05-26 20:45:18.000000000 -0700
@@ -90,7 +90,23 @@
}
static TagCollection of(Map> param0) {
- // $FF: Couldn't be decompiled
+ final BiMap> var0 = ImmutableBiMap.copyOf(param0);
+ return new TagCollection() {
+ private final Tag empty = SetTag.empty();
+
+ public Tag getTagOrEmpty(ResourceLocation param0) {
+ return var0.getOrDefault(param0, this.empty);
+ }
+
+ @Nullable
+ public ResourceLocation getId(Tag param0) {
+ return param0 instanceof Tag.Named ? ((Tag.Named)param0).getName() : var0.inverse().get(param0);
+ }
+
+ public Map> getAllTags() {
+ return var0;
+ }
+ };
}
public static class NetworkPayload {
diff -r -u3 -N a/net/minecraft/tags/TagContainer.java b/net/minecraft/tags/TagContainer.java
--- a/net/minecraft/tags/TagContainer.java 2021-05-12 08:33:24.000000000 -0700
+++ b/net/minecraft/tags/TagContainer.java 2021-05-26 20:45:18.000000000 -0700
@@ -75,7 +75,19 @@
}
public Map>, TagCollection.NetworkPayload> serializeToNetwork(final RegistryAccess param0) {
- // $FF: Couldn't be decompiled
+ final Map>, TagCollection.NetworkPayload> var0 = Maps.newHashMap();
+ this.getAll(new TagContainer.CollectionConsumer() {
+ public void accept(ResourceKey> param0x, TagCollection param1) {
+ Optional> var0 = param0.registry(param0);
+ if (var0.isPresent()) {
+ var0.put(param0, param1.serializeToNetwork(var0.get()));
+ } else {
+ TagContainer.LOGGER.error("Unknown registry {}", (Object)param0);
+ }
+
+ }
+ });
+ return var0;
}
public static TagContainer deserializeFromNetwork(RegistryAccess param0, Map>, TagCollection.NetworkPayload> param1) {
diff -r -u3 -N a/net/minecraft/util/profiling/ProfilerFiller.java b/net/minecraft/util/profiling/ProfilerFiller.java
--- a/net/minecraft/util/profiling/ProfilerFiller.java 2021-05-12 08:33:06.000000000 -0700
+++ b/net/minecraft/util/profiling/ProfilerFiller.java 2021-05-26 20:45:18.000000000 -0700
@@ -24,6 +24,55 @@
void incrementCounter(Supplier var1);
static ProfilerFiller tee(final ProfilerFiller param0, final ProfilerFiller param1) {
- // $FF: Couldn't be decompiled
+ if (param0 == InactiveProfiler.INSTANCE) {
+ return param1;
+ } else {
+ return param1 == InactiveProfiler.INSTANCE ? param0 : new ProfilerFiller() {
+ public void startTick() {
+ param0.startTick();
+ param1.startTick();
+ }
+
+ public void endTick() {
+ param0.endTick();
+ param1.endTick();
+ }
+
+ public void push(String param0x) {
+ param0.push(param0);
+ param1.push(param0);
+ }
+
+ public void push(Supplier param0x) {
+ param0.push(param0);
+ param1.push(param0);
+ }
+
+ public void pop() {
+ param0.pop();
+ param1.pop();
+ }
+
+ public void popPush(String param0x) {
+ param0.popPush(param0);
+ param1.popPush(param0);
+ }
+
+ public void popPush(Supplier param0x) {
+ param0.popPush(param0);
+ param1.popPush(param0);
+ }
+
+ public void incrementCounter(String param0x) {
+ param0.incrementCounter(param0);
+ param1.incrementCounter(param0);
+ }
+
+ public void incrementCounter(Supplier param0x) {
+ param0.incrementCounter(param0);
+ param1.incrementCounter(param0);
+ }
+ };
+ }
}
}
diff -r -u3 -N a/net/minecraft/util/StringRepresentable.java b/net/minecraft/util/StringRepresentable.java
--- a/net/minecraft/util/StringRepresentable.java 2021-05-12 08:33:28.000000000 -0700
+++ b/net/minecraft/util/StringRepresentable.java 2021-05-26 20:45:18.000000000 -0700
@@ -1,10 +1,13 @@
package net.minecraft.util;
+import com.mojang.datafixers.util.Pair;
import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
import com.mojang.serialization.DynamicOps;
import com.mojang.serialization.Keyable;
import java.util.Arrays;
import java.util.Objects;
+import java.util.Optional;
import java.util.function.Function;
import java.util.function.IntFunction;
import java.util.function.Supplier;
@@ -21,7 +24,19 @@
}
static Codec fromStringResolver(final ToIntFunction param0, final IntFunction param1, final Function param2) {
- // $FF: Couldn't be decompiled
+ return new Codec() {
+ public DataResult encode(E param0x, DynamicOps param1x, T param2x) {
+ return param1.compressMaps() ? param1.mergeToPrimitive(param2, param1.createInt(param0.applyAsInt(param0))) : param1.mergeToPrimitive(param2, param1.createString(param0.getSerializedName()));
+ }
+
+ public DataResult> decode(DynamicOps param0x, T param1x) {
+ return param0.compressMaps() ? param0.getNumberValue(param1).flatMap((param1xx) -> Optional.ofNullable(param1.apply(param1xx.intValue())).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown element id: " + param1xx))).map((param1xx) -> Pair.of(param1xx, param0.empty())) : param0.getStringValue(param1).flatMap((param1xx) -> Optional.ofNullable(param2.apply(param1xx)).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown element name: " + param1xx))).map((param1xx) -> Pair.of(param1xx, param0.empty()));
+ }
+
+ public String toString() {
+ return "StringRepresentable[" + param0 + "]";
+ }
+ };
}
static Keyable keys(final StringRepresentable[] param0) {
diff -r -u3 -N a/net/minecraft/util/thread/ProcessorHandle.java b/net/minecraft/util/thread/ProcessorHandle.java
--- a/net/minecraft/util/thread/ProcessorHandle.java 2021-05-12 08:33:20.000000000 -0700
+++ b/net/minecraft/util/thread/ProcessorHandle.java 2021-05-26 20:45:18.000000000 -0700
@@ -35,6 +35,18 @@
}
static ProcessorHandle of(final String param0, final Consumer param1) {
- // $FF: Couldn't be decompiled
+ return new ProcessorHandle() {
+ public String name() {
+ return param0;
+ }
+
+ public void tell(Msg param0x) {
+ param1.accept(param0);
+ }
+
+ public String toString() {
+ return param0;
+ }
+ };
}
}
diff -r -u3 -N a/net/minecraft/Util.java b/net/minecraft/Util.java
--- a/net/minecraft/Util.java 2021-05-12 08:33:10.000000000 -0700
+++ b/net/minecraft/Util.java 2021-05-26 20:45:18.000000000 -0700
@@ -2,10 +2,12 @@
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import com.google.common.util.concurrent.MoreExecutors;
import com.mojang.datafixers.DataFixUtils;
import com.mojang.datafixers.DSL.TypeReference;
import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.util.Pair;
import com.mojang.serialization.DataResult;
import it.unimi.dsi.fastutil.Hash.Strategy;
import java.io.File;
@@ -398,7 +400,21 @@
}
private static BooleanSupplier createRenamer(final Path param0, final Path param1) {
- // $FF: Couldn't be decompiled
+ return new BooleanSupplier() {
+ public boolean getAsBoolean() {
+ try {
+ Files.move(param0, param1);
+ return true;
+ } catch (IOException var2) {
+ Util.LOGGER.error("Failed to rename", (Throwable)var2);
+ return false;
+ }
+ }
+
+ public String toString() {
+ return "rename " + param0 + " to " + param1;
+ }
+ };
}
private static BooleanSupplier createDeleter(final Path param0) {
@@ -555,11 +571,31 @@
}
public static Function memoize(final Function param0) {
- // $FF: Couldn't be decompiled
+ return new Function() {
+ private final Map cache = Maps.newHashMap();
+
+ public R apply(T param0x) {
+ return this.cache.computeIfAbsent(param0, param0);
+ }
+
+ public String toString() {
+ return "memoize/1[function=" + param0 + ", size=" + this.cache.size() + "]";
+ }
+ };
}
public static BiFunction memoize(final BiFunction param0) {
- // $FF: Couldn't be decompiled
+ return new BiFunction() {
+ private final Map, R> cache = Maps.newHashMap();
+
+ public R apply(T param0x, U param1) {
+ return this.cache.computeIfAbsent(Pair.of(param0, param1), (param1x) -> param0.apply(param1x.getFirst(), param1x.getSecond()));
+ }
+
+ public String toString() {
+ return "memoize/2[function=" + param0 + ", size=" + this.cache.size() + "]";
+ }
+ };
}
static enum IdentityStrategy implements Strategy