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

Update to Forge 1.18.2

Browse Source
This commit is contained in:
shedaniel
2022-03-02 11:43:45 +08:00
parent b0517249b6
commit d550eef8e2
11 changed files with 100 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@
package dev.architectury.hooks.level.biome;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.sounds.Music;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.EntityType;
@@ -30,7 +29,6 @@ import net.minecraft.world.level.biome.Biome.BiomeCategory;
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;
@@ -38,7 +36,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.OptionalInt;
import java.util.function.Supplier;
public final class BiomeHooks {
public static BiomeProperties getBiomeProperties(Biome biome) {
@@ -370,8 +367,8 @@ public final class BiomeHooks {
}
@Override
public List<HolderSet<PlacedFeature>> getFeatures() {
return settings.features();
public List<Iterable<Holder<PlacedFeature>>> getFeatures() {
return (List<Iterable<Holder<PlacedFeature>>>) (List<?>) settings.features();
}
}

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

@@ -20,30 +20,73 @@
package dev.architectury.hooks.level.biome;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.data.BuiltinRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import org.jetbrains.annotations.ApiStatus;
import java.util.List;
import java.util.Optional;
public interface GenerationProperties {
Iterable<Holder<ConfiguredWorldCarver<?>>> getCarvers(GenerationStep.Carving carving);
Iterable<Holder<PlacedFeature>> getFeatures(GenerationStep.Decoration decoration);
List<HolderSet<PlacedFeature>> getFeatures();
List<Iterable<Holder<PlacedFeature>>> getFeatures();
interface Mutable extends GenerationProperties {
@ApiStatus.Experimental
Mutable addFeature(GenerationStep.Decoration decoration, PlacedFeature feature);
@Deprecated
default Mutable addFeature(GenerationStep.Decoration decoration, PlacedFeature feature) {
Optional<ResourceKey<PlacedFeature>> key = BuiltinRegistries.PLACED_FEATURE.getResourceKey(feature);
if (key.isPresent()) {
return addFeature(decoration, BuiltinRegistries.PLACED_FEATURE.getHolderOrThrow(key.get()));
} else {
return addFeature(decoration, Holder.direct(feature));
}
}
Mutable addCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature);
Mutable addFeature(GenerationStep.Decoration decoration, Holder<PlacedFeature> feature);
@ApiStatus.Experimental
Mutable removeFeature(GenerationStep.Decoration decoration, PlacedFeature feature);
@Deprecated
default Mutable addCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature) {
Optional<ResourceKey<ConfiguredWorldCarver<?>>> key = BuiltinRegistries.CONFIGURED_CARVER.getResourceKey(feature);
if (key.isPresent()) {
return addCarver(carving, BuiltinRegistries.CONFIGURED_CARVER.getHolderOrThrow(key.get()));
} else {
return addCarver(carving, Holder.direct(feature));
}
}
Mutable removeCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature);
Mutable addCarver(GenerationStep.Carving carving, Holder<ConfiguredWorldCarver<?>> feature);
@Deprecated
default Mutable removeFeature(GenerationStep.Decoration decoration, PlacedFeature feature) {
Optional<ResourceKey<PlacedFeature>> key = BuiltinRegistries.PLACED_FEATURE.getResourceKey(feature);
if (key.isPresent()) {
return removeFeature(decoration, key.get());
} else {
// This is dumb
System.err.println("Attempted to remove a dynamic feature with a deprecated builtin method!");
return this;
}
}
Mutable removeFeature(GenerationStep.Decoration decoration, ResourceKey<PlacedFeature> feature);
@Deprecated
default Mutable removeCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature) {
Optional<ResourceKey<ConfiguredWorldCarver<?>>> key = BuiltinRegistries.CONFIGURED_CARVER.getResourceKey(feature);
if (key.isPresent()) {
return removeCarver(carving, key.get());
} else {
// This is dumb
System.err.println("Attempted to remove a dynamic carver with a deprecated builtin method!");
return this;
}
}
Mutable removeCarver(GenerationStep.Carving carving, ResourceKey<ConfiguredWorldCarver<?>> feature);
}
}