imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.18-pre1

Browse Source
This commit is contained in:
shedaniel
2021-11-14 02:30:22 +08:00
parent e3fb2e577d
commit 52d3bad6f8
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/dev/architectury/hooks/level/biome/BiomeHooks.java
View File

@@ -29,6 +29,7 @@ import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -362,7 +363,7 @@ public final class BiomeHooks {
}
@Override
public List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures() {
public List<List<Supplier<PlacedFeature>>> getFeatures() {
return settings.features();
}
}

3
common/src/main/java/dev/architectury/hooks/level/biome/GenerationProperties.java
View File

@@ -23,6 +23,7 @@ import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import java.util.List;
import java.util.function.Supplier;
@@ -30,7 +31,7 @@ import java.util.function.Supplier;
public interface GenerationProperties {
List<Supplier<ConfiguredWorldCarver<?>>> getCarvers(GenerationStep.Carving carving);
List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
List<List<Supplier<PlacedFeature>>> getFeatures();
interface Mutable extends GenerationProperties {
Mutable addFeature(GenerationStep.Decoration decoration, ConfiguredFeature<?, ?> feature);

4
fabric/src/main/java/dev/architectury/mixin/fabric/MixinChunkSerializer.java
View File

@@ -28,7 +28,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiManager;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.chunk.*;
import net.minecraft.world.level.chunk.storage.ChunkSerializer;
import net.minecraft.world.level.levelgen.blending.GenerationUpgradeData;
import net.minecraft.world.level.levelgen.blending.BlendingData;
import net.minecraft.world.level.lighting.LevelLightEngine;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -43,7 +43,7 @@ public class MixinChunkSerializer {
CallbackInfoReturnable<ProtoChunk> cir, UpgradeData upgradeData,
boolean bl, ListTag listTag, int i, LevelChunkSection levelChunkSections[], boolean bl2, ChunkSource chunkSource,
LevelLightEngine levelLightEngine, Registry registry, long m, ChunkStatus.ChunkType chunkType,
GenerationUpgradeData generationUpgradeData, ChunkAccess chunkAccess2) {
BlendingData blendingData, ChunkAccess chunkAccess2) {
ChunkEvent.LOAD_DATA.invoker().load(chunkAccess2, serverLevel, compoundTag);
}
}

8
fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java
View File

@@ -23,12 +23,12 @@ import com.google.common.base.Predicates;
import com.google.common.collect.Lists;
import dev.architectury.hooks.level.biome.*;
import dev.architectury.registry.level.biome.BiomeModifications.BiomeContext;
import net.fabricmc.fabric.api.biome.v1.BiomeModification;
/*import net.fabricmc.fabric.api.biome.v1.BiomeModification;
import net.fabricmc.fabric.api.biome.v1.BiomeModificationContext;
import net.fabricmc.fabric.api.biome.v1.BiomeModificationContext.GenerationSettingsContext;
import net.fabricmc.fabric.api.biome.v1.BiomeModificationContext.SpawnSettingsContext;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext;
import net.fabricmc.fabric.api.biome.v1.ModificationPhase;
import net.fabricmc.fabric.api.biome.v1.ModificationPhase;*/
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.Music;
import net.minecraft.sounds.SoundEvent;
@@ -76,7 +76,7 @@ public class BiomeModificationsImpl {
REPLACEMENTS.add(Pair.of(predicate, modifier));
}
static {
/*static {
var modification = net.fabricmc.fabric.api.biome.v1.BiomeModifications.create(FABRIC_MODIFICATION);
registerModification(modification, ModificationPhase.ADDITIONS, ADDITIONS);
registerModification(modification, ModificationPhase.POST_PROCESSING, POST_PROCESSING);
@@ -344,6 +344,6 @@ public class BiomeModificationsImpl {
return this;
}
};
}
}*/
}

8
gradle.properties
View File

@@ -3,8 +3,8 @@ org.gradle.daemon=false
forgeEnabled=false
minecraft_version=21w44a
supported_version=21w44a
minecraft_version=1.18-pre1
supported_version=1.18-pre1
crane_version=1.17.1+build.1
cf_type=beta
@@ -14,8 +14,8 @@ archives_base_name_snapshot=architectury-snapshot
base_version=3.0
maven_group=dev.architectury
fabric_loader_version=0.11.7
fabric_api_version=0.41.4+1.18
fabric_loader_version=0.12.5
fabric_api_version=0.42.2+1.18
mod_menu_version=3.0.0
forge_version=37.0.69