diff --git a/gradle.properties b/gradle.properties index 58d5cdbe..c65e4e44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx2G #Loom -loom_version=0.9-SNAPSHOT +loom_version=0.10-SNAPSHOT # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version= 21w38a -loader_version= 0.11.7 -fabric_version = 0.40.4+1.18 +minecraft_version= 21w40a +loader_version= 0.12.1 +fabric_version = 0.40.8+1.18 # Mod Properties mod_version = 0.4.1 diff --git a/src/main/java/ru/bclib/api/datafixer/MigrationProfile.java b/src/main/java/ru/bclib/api/datafixer/MigrationProfile.java index 24e5e8ad..10b8a593 100644 --- a/src/main/java/ru/bclib/api/datafixer/MigrationProfile.java +++ b/src/main/java/ru/bclib/api/datafixer/MigrationProfile.java @@ -1,6 +1,5 @@ package ru.bclib.api.datafixer; -import net.fabricmc.loom.util.ModUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtIo; diff --git a/src/main/java/ru/bclib/util/ModUtil.java b/src/main/java/ru/bclib/util/ModUtil.java index db873bc5..2f3e9978 100644 --- a/src/main/java/ru/bclib/util/ModUtil.java +++ b/src/main/java/ru/bclib/util/ModUtil.java @@ -5,21 +5,23 @@ import net.fabricmc.loader.api.ModContainer; import net.fabricmc.loader.api.SemanticVersion; import net.fabricmc.loader.api.Version; import net.fabricmc.loader.api.metadata.ModMetadata; -import net.fabricmc.loader.metadata.ModMetadataParser; -import net.fabricmc.loader.metadata.ParseMetadataException; +import net.fabricmc.loader.impl.metadata.ModMetadataParser; +import net.fabricmc.loader.impl.metadata.ParseMetadataException; import org.apache.logging.log4j.LogManager; import ru.bclib.BCLib; import java.io.IOException; +import java.io.InputStream; import java.net.URI; import java.nio.file.FileSystem; import java.nio.file.FileSystems; +import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; +import java.util.LinkedList; import java.util.Locale; import java.util.Map; import java.util.Optional; -import java.util.jar.JarFile; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -56,8 +58,11 @@ public class ModUtil { try { Path modMetaFile = fs.getPath("fabric.mod.json"); if (modMetaFile != null) { - ModMetadata mc = ModMetadataParser.parseMetadata(logger, modMetaFile); - mods.put(mc.getId(), new ModInfo(mc, file)); + try (InputStream is = Files.newInputStream(modMetaFile)) { + ModMetadata mc = ModMetadataParser.parseMetadata(is, uri.toString(), new LinkedList()); + mods.put(mc.getId(), new ModInfo(mc, file)); + } + } } catch (ParseMetadataException e) { BCLib.LOGGER.error(e.getMessage()); diff --git a/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java b/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java index 6f442b0f..7e236521 100644 --- a/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java +++ b/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java @@ -11,6 +11,7 @@ import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.Climate; 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.synth.SimplexNoise; import ru.bclib.BCLib; @@ -76,7 +77,7 @@ public class BCLibEndBiomeSource extends BiomeSource { this.biomeRegistry = biomeRegistry; this.seed = seed; - WorldgenRandom chunkRandom = new WorldgenRandom(seed); + WorldgenRandom chunkRandom = new WorldgenRandom(new LegacyRandomSource(seed)); chunkRandom.consumeCount(17292); this.noise = new SimplexNoise(chunkRandom); diff --git a/src/main/java/ru/bclib/world/generator/BiomeMap.java b/src/main/java/ru/bclib/world/generator/BiomeMap.java index 9de76325..43614a3d 100644 --- a/src/main/java/ru/bclib/world/generator/BiomeMap.java +++ b/src/main/java/ru/bclib/world/generator/BiomeMap.java @@ -2,6 +2,7 @@ package ru.bclib.world.generator; import com.google.common.collect.Maps; import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import ru.bclib.noise.OpenSimplexNoise; import ru.bclib.util.MHelper; @@ -10,7 +11,7 @@ import ru.bclib.world.biomes.BCLBiome; import java.util.Map; public class BiomeMap { - private static final WorldgenRandom RANDOM = new WorldgenRandom(); + private final WorldgenRandom RANDOM; private final Map maps = Maps.newHashMap(); private final int size; @@ -23,7 +24,7 @@ public class BiomeMap { public BiomeMap(long seed, int size, BiomePicker picker) { maps.clear(); - RANDOM.setSeed(seed); + RANDOM = new WorldgenRandom(new LegacyRandomSource(seed)); noiseX = new OpenSimplexNoise(RANDOM.nextLong()); noiseZ = new OpenSimplexNoise(RANDOM.nextLong()); this.sizeXZ = size;