OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 23:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update decompiler & param mappings

Browse source
This commit is contained in:
Jason Penilla 2022-04-05 10:36:14 -07:00
parent 1f665d8c9f
commit 3634760ece
2 changed files with 2 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle.kts
View file

@ -56,9 +56,9 @@ repositories {
}
dependencies {
paramMappings("net.fabricmc:yarn:1.18.2+build.1:mergedv2")
paramMappings("net.fabricmc:yarn:1.18.2+build.2:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.8.1:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.22")
decompiler("net.minecraftforge:forgeflower:1.5.498.29")
paperclip("io.papermc:paperclip:3.0.2")
}

63
patches/server/MC-Dev-fixes.patch
View file

@ -152,36 +152,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private static final int MIN_PROTOCOL_ID = -1;
private static final int MAX_PROTOCOL_ID = 2;
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
@@ -0,0 +0,0 @@ public record ClientboundLoginPacket(int playerId, boolean hardcore, GameType ga
}), buf.readWithCodec(RegistryAccess.NETWORK_CODEC).freeze(), buf.readWithCodec(DimensionType.CODEC), ResourceKey.create(Registry.DIMENSION_REGISTRY, buf.readResourceLocation()), buf.readLong(), buf.readVarInt(), buf.readVarInt(), buf.readVarInt(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean());
}
- public ClientboundLoginPacket(int playerEntityId, boolean bl, GameType previousGameMode, @Nullable GameType gameType, Set<ResourceKey<Level>> set, RegistryAccess.Frozen frozen, Holder<DimensionType> holder, ResourceKey<Level> resourceKey, long l, int maxPlayers, int chunkLoadDistance, int i, boolean bl2, boolean bl3, boolean bl4, boolean bl5) {
- this.playerId = playerEntityId;
- this.hardcore = bl;
- this.gameType = previousGameMode;
- this.previousGameType = gameType;
- this.levels = set;
- this.registryHolder = frozen;
- this.dimensionType = holder;
- this.dimension = resourceKey;
- this.seed = l;
- this.maxPlayers = maxPlayers;
- this.chunkRadius = chunkLoadDistance;
- this.simulationDistance = i;
- this.reducedDebugInfo = bl2;
- this.showDeathScreen = bl3;
- this.isDebug = bl4;
- this.isFlat = bl5;
- }
-
@Override
public void write(FriendlyByteBuf buf) {
buf.writeInt(this.playerId);
diff --git a/src/main/java/net/minecraft/resources/RegistryLoader.java b/src/main/java/net/minecraft/resources/RegistryLoader.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/resources/RegistryLoader.java
@ -195,17 +165,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return new RegistryLoader.ReadCache();
});
}
@@ -0,0 +0,0 @@ public class RegistryLoader {
}
public static record Bound(RegistryAccess.Writable access, RegistryLoader loader) {
- public Bound(RegistryAccess.Writable writable, RegistryLoader registryLoader) {
- this.access = writable;
- this.loader = registryLoader;
- }
public <E> DataResult<? extends Registry<E>> overrideRegistryFromResources(ResourceKey<? extends Registry<E>> registryRef, Codec<E> codec, DynamicOps<JsonElement> ops) {
WritableRegistry<E> writableRegistry = this.access.ownedWritableRegistryOrThrow(registryRef);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
@ -297,28 +256,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(object)).listOf().fieldOf("palette").forGetter(PalettedContainer.DiscData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainer.DiscData::storage)).apply(instance, PalettedContainer.DiscData::new);
}).comapFlatMap((serialized) -> {
return read(idList, provider, serialized);
@@ -0,0 +0,0 @@ public class PalettedContainer<T> implements PaletteResize<T> {
}
static record Configuration<T>(Palette.Factory factory, int bits) {
- Configuration(Palette.Factory factory, int i) {
- this.factory = factory;
- this.bits = i;
- }
public PalettedContainer.Data<T> createData(IdMap<T> idList, PaletteResize<T> listener, int size) {
BitStorage bitStorage = (BitStorage)(this.bits == 0 ? new ZeroBitStorage(size) : new SimpleBitStorage(this.bits, size));
@@ -0,0 +0,0 @@ public class PalettedContainer<T> implements PaletteResize<T> {
}
static record DiscData<T>(List<T> paletteEntries, Optional<LongStream> storage) {
- DiscData(List<T> list, Optional<LongStream> optional) {
- this.paletteEntries = list;
- this.storage = optional;
- }
}
public abstract static class Strategy {
diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java