MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes for 21w40a

Browse source
This commit is contained in:
Frank 2021-10-12 14:53:14 +02:00
parent 08f35ab52c
commit 74533e2e66
5 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gradle.properties
View file

@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
#Loom #Loom
loom_version=0.9-SNAPSHOT loom_version=0.10-SNAPSHOT
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/versions.html # check these on https://fabricmc.net/versions.html
minecraft_version= 21w38a minecraft_version= 21w40a
loader_version= 0.11.7 loader_version= 0.12.1
fabric_version = 0.40.4+1.18 fabric_version = 0.40.8+1.18
# Mod Properties # Mod Properties
mod_version = 0.4.1 mod_version = 0.4.1

1
src/main/java/ru/bclib/api/datafixer/MigrationProfile.java
View file

@ -1,6 +1,5 @@
package ru.bclib.api.datafixer; package ru.bclib.api.datafixer;
import net.fabricmc.loom.util.ModUtils;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag; import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.NbtIo;

15
src/main/java/ru/bclib/util/ModUtil.java
View file

@ -5,21 +5,23 @@ import net.fabricmc.loader.api.ModContainer;
import net.fabricmc.loader.api.SemanticVersion; import net.fabricmc.loader.api.SemanticVersion;
import net.fabricmc.loader.api.Version; import net.fabricmc.loader.api.Version;
import net.fabricmc.loader.api.metadata.ModMetadata; import net.fabricmc.loader.api.metadata.ModMetadata;
import net.fabricmc.loader.metadata.ModMetadataParser; import net.fabricmc.loader.impl.metadata.ModMetadataParser;
import net.fabricmc.loader.metadata.ParseMetadataException; import net.fabricmc.loader.impl.metadata.ParseMetadataException;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import ru.bclib.BCLib; import ru.bclib.BCLib;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.URI; import java.net.URI;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
import java.nio.file.FileSystems; import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.jar.JarFile;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -56,8 +58,11 @@ public class ModUtil {
try { try {
Path modMetaFile = fs.getPath("fabric.mod.json"); Path modMetaFile = fs.getPath("fabric.mod.json");
if (modMetaFile != null) { if (modMetaFile != null) {
ModMetadata mc = ModMetadataParser.parseMetadata(logger, modMetaFile); try (InputStream is = Files.newInputStream(modMetaFile)) {
mods.put(mc.getId(), new ModInfo(mc, file)); ModMetadata mc = ModMetadataParser.parseMetadata(is, uri.toString(), new LinkedList<String>());
mods.put(mc.getId(), new ModInfo(mc, file));
}
} }
} catch (ParseMetadataException e) { } catch (ParseMetadataException e) {
BCLib.LOGGER.error(e.getMessage()); BCLib.LOGGER.error(e.getMessage());

3
src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java
View file

@ -11,6 +11,7 @@ import net.minecraft.world.level.biome.BiomeSource;
import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.Biomes;
import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.Climate;
import net.minecraft.world.level.biome.TheEndBiomeSource; import net.minecraft.world.level.biome.TheEndBiomeSource;
import net.minecraft.world.level.levelgen.LegacyRandomSource;
import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.WorldgenRandom;
import net.minecraft.world.level.levelgen.synth.SimplexNoise; import net.minecraft.world.level.levelgen.synth.SimplexNoise;
import ru.bclib.BCLib; import ru.bclib.BCLib;
@ -76,7 +77,7 @@ public class BCLibEndBiomeSource extends BiomeSource {
this.biomeRegistry = biomeRegistry; this.biomeRegistry = biomeRegistry;
this.seed = seed; this.seed = seed;
WorldgenRandom chunkRandom = new WorldgenRandom(seed); WorldgenRandom chunkRandom = new WorldgenRandom(new LegacyRandomSource(seed));
chunkRandom.consumeCount(17292); chunkRandom.consumeCount(17292);
this.noise = new SimplexNoise(chunkRandom); this.noise = new SimplexNoise(chunkRandom);

5
src/main/java/ru/bclib/world/generator/BiomeMap.java
View file

@ -2,6 +2,7 @@ package ru.bclib.world.generator;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.levelgen.LegacyRandomSource;
import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.WorldgenRandom;
import ru.bclib.noise.OpenSimplexNoise; import ru.bclib.noise.OpenSimplexNoise;
import ru.bclib.util.MHelper; import ru.bclib.util.MHelper;
@ -10,7 +11,7 @@ import ru.bclib.world.biomes.BCLBiome;
import java.util.Map; import java.util.Map;
public class BiomeMap { public class BiomeMap {
private static final WorldgenRandom RANDOM = new WorldgenRandom(); private final WorldgenRandom RANDOM;
private final Map<ChunkPos, BiomeChunk> maps = Maps.newHashMap(); private final Map<ChunkPos, BiomeChunk> maps = Maps.newHashMap();
private final int size; private final int size;
@ -23,7 +24,7 @@ public class BiomeMap {
public BiomeMap(long seed, int size, BiomePicker picker) { public BiomeMap(long seed, int size, BiomePicker picker) {
maps.clear(); maps.clear();
RANDOM.setSeed(seed); RANDOM = new WorldgenRandom(new LegacyRandomSource(seed));
noiseX = new OpenSimplexNoise(RANDOM.nextLong()); noiseX = new OpenSimplexNoise(RANDOM.nextLong());
noiseZ = new OpenSimplexNoise(RANDOM.nextLong()); noiseZ = new OpenSimplexNoise(RANDOM.nextLong());
this.sizeXZ = size; this.sizeXZ = size;