geforkt von Mirrors/Paper
Fix mc dev fix by removing it
Dieser Commit ist enthalten in:
Ursprung
b8e2fdf5d9
Commit
2749c38c43
@ -217,79 +217,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
}));
|
}));
|
||||||
this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
|
this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
|
||||||
RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
|
RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/world/level/biome/Biome.java
|
|
||||||
+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
|
|
||||||
@@ -0,0 +0,0 @@ import net.minecraft.world.level.material.FluidState;
|
|
||||||
import net.minecraft.world.level.material.Fluids;
|
|
||||||
|
|
||||||
public final class Biome {
|
|
||||||
- public static final Codec<Biome> DIRECT_CODEC;
|
|
||||||
- public static final Codec<Biome> NETWORK_CODEC;
|
|
||||||
+ // Paper start - decompile fix: move up verbatim from static block
|
|
||||||
+ public static final Codec<Biome> DIRECT_CODEC = RecordCodecBuilder.create((instance) -> {
|
|
||||||
+ return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
|
|
||||||
+ return biome.climateSettings;
|
|
||||||
+ }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
|
|
||||||
+ return biome.biomeCategory;
|
|
||||||
+ }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
|
|
||||||
+ return biome.specialEffects;
|
|
||||||
+ }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
|
|
||||||
+ return biome.generationSettings;
|
|
||||||
+ }), MobSpawnSettings.CODEC.forGetter((biome) -> {
|
|
||||||
+ return biome.mobSettings;
|
|
||||||
+ })).apply(instance, Biome::new);
|
|
||||||
+ });
|
|
||||||
+ public static final Codec<Biome> NETWORK_CODE = RecordCodecBuilder.create((instance) -> {
|
|
||||||
+ return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
|
|
||||||
+ return biome.climateSettings;
|
|
||||||
+ }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
|
|
||||||
+ return biome.biomeCategory;
|
|
||||||
+ }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
|
|
||||||
+ return biome.specialEffects;
|
|
||||||
+ })).apply(instance, (weather, category, effects) -> {
|
|
||||||
+ return new Biome(weather, category, effects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
|
|
||||||
+ });
|
|
||||||
+ });
|
|
||||||
+ // Paper end
|
|
||||||
public static final Codec<Holder<Biome>> CODEC = RegistryFileCodec.create(Registry.BIOME_REGISTRY, DIRECT_CODEC);
|
|
||||||
public static final Codec<HolderSet<Biome>> LIST_CODEC = RegistryCodecs.homogeneousList(Registry.BIOME_REGISTRY, DIRECT_CODEC);
|
|
||||||
private static final PerlinSimplexNoise TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(1234L)), ImmutableList.of(0));
|
|
||||||
@@ -0,0 +0,0 @@ public final class Biome {
|
|
||||||
return biomeEntry.value().getBiomeCategory();
|
|
||||||
}
|
|
||||||
|
|
||||||
- static {
|
|
||||||
- DIRECT_CODEC = RecordCodecBuilder.create((instance) -> {
|
|
||||||
- return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
|
|
||||||
- return biome.climateSettings;
|
|
||||||
- }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
|
|
||||||
- return biome.biomeCategory;
|
|
||||||
- }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
|
|
||||||
- return biome.specialEffects;
|
|
||||||
- }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
|
|
||||||
- return biome.generationSettings;
|
|
||||||
- }), MobSpawnSettings.CODEC.forGetter((biome) -> {
|
|
||||||
- return biome.mobSettings;
|
|
||||||
- })).apply(instance, Biome::new);
|
|
||||||
- });
|
|
||||||
- NETWORK_CODEC = RecordCodecBuilder.create((instance) -> {
|
|
||||||
- return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
|
|
||||||
- return biome.climateSettings;
|
|
||||||
- }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
|
|
||||||
- return biome.biomeCategory;
|
|
||||||
- }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
|
|
||||||
- return biome.specialEffects;
|
|
||||||
- })).apply(instance, (weather, category, effects) -> {
|
|
||||||
- return new Biome(weather, category, effects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
|
|
||||||
- });
|
|
||||||
- });
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
public static class BiomeBuilder {
|
|
||||||
@Nullable
|
|
||||||
private Biome.Precipitation precipitation;
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
--- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren