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 21w41a

Browse Source
This commit is contained in:
shedaniel
2021-10-14 17:07:02 +08:00
parent fd334a005f
commit e1738f7a2d
7 changed files with 8 additions and 30 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

@@ -29,8 +29,6 @@ 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.feature.ConfiguredStructureFeature;
import net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -358,11 +356,6 @@ public final class BiomeHooks {
this.settings = settings;
}
@Override
public Optional<Supplier<ConfiguredSurfaceBuilder<?>>> getSurfaceBuilder() {
return Optional.ofNullable(settings.getSurfaceBuilder());
}
@Override
public List<Supplier<ConfiguredWorldCarver<?>>> getCarvers(GenerationStep.Carving carving) {
return settings.getCarvers(carving);

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

@@ -23,22 +23,16 @@ 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.surfacebuilders.ConfiguredSurfaceBuilder;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
public interface GenerationProperties {
Optional<Supplier<ConfiguredSurfaceBuilder<?>>> getSurfaceBuilder();
List<Supplier<ConfiguredWorldCarver<?>>> getCarvers(GenerationStep.Carving carving);
List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
interface Mutable extends GenerationProperties {
Mutable setSurfaceBuilder(ConfiguredSurfaceBuilder<?> builder);
Mutable addFeature(GenerationStep.Decoration decoration, ConfiguredFeature<?, ?> feature);
Mutable addCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature);

4
fabric/build.gradle
View File

@@ -107,9 +107,7 @@ curseforge {
releaseType = "$rootProject.cf_type"
changelogType = "html"
changelog = releaseChangelog()
addGameVersion "1.17"
addGameVersion "1.17.1"
addGameVersion "1.17-Snapshot"
addGameVersion "1.18-Snapshot"
addGameVersion "Java 16"
addGameVersion "Fabric"
relations {

2
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientLevel.java
View File

@@ -39,7 +39,7 @@ import java.util.function.Supplier;
@Mixin(ClientLevel.class)
public class MixinClientLevel {
@Inject(method = "<init>", at = @At("RETURN"))
private void construct(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey<Level> resourceKey, DimensionType dimensionType, int i, Supplier<ProfilerFiller> supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
private void construct(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey<Level> resourceKey, DimensionType dimensionType, int i, int j, Supplier<ProfilerFiller> supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
ClientLifecycleEvent.CLIENT_LEVEL_LOAD.invoker().act((ClientLevel) (Object) this);
}

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

@@ -43,7 +43,6 @@ 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.surfacebuilders.ConfiguredSurfaceBuilder;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -140,12 +139,6 @@ public class BiomeModificationsImpl {
this.context = context;
}
@Override
public Mutable setSurfaceBuilder(ConfiguredSurfaceBuilder<?> builder) {
this.context.setBuiltInSurfaceBuilder(builder);
return this;
}
@Override
public Mutable addFeature(GenerationStep.Decoration decoration, ConfiguredFeature<?, ?> feature) {
this.context.addBuiltInFeature(decoration, feature);

2
fabric/src/main/resources/fabric.mod.json
View File

@@ -32,7 +32,7 @@
"accessWidener": "architectury.accessWidener",
"icon": "icon.png",
"depends": {
"minecraft": "~1.17.1"
"minecraft": "~1.18-"
},
"custom": {
"modmenu:api": true

10
gradle.properties
View File

@@ -3,11 +3,11 @@ org.gradle.daemon=false
forgeEnabled=false
minecraft_version=21w37a
supported_version=21w37a
minecraft_version=21w41a
supported_version=21w41a
crane_version=1.17.1+build.1
cf_type=release
cf_type=beta
archives_base_name=architectury
archives_base_name_snapshot=architectury-snapshot
@@ -15,7 +15,7 @@ base_version=3.0
maven_group=dev.architectury
fabric_loader_version=0.11.7
fabric_api_version=0.40.3+1.18
mod_menu_version=2.0.0-beta.7
fabric_api_version=0.40.9+1.18
mod_menu_version=3.0.0
forge_version=37.0.69