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

3
forge/src/main/java/dev/architectury/mixin/forge/MixinClientLevel.java
View File

@@ -21,6 +21,7 @@ package dev.architectury.mixin.forge;
import dev.architectury.event.events.client.ClientTickEvent;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.Holder;
import net.minecraft.resources.ResourceKey;
import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.world.level.Level;
@@ -35,7 +36,7 @@ import java.util.function.Supplier;
@Mixin(ClientLevel.class)
public abstract class MixinClientLevel extends Level {
protected MixinClientLevel(WritableLevelData worldInfo, ResourceKey<Level> dimension, DimensionType dimensionType, Supplier<ProfilerFiller> profiler, boolean isRemote, boolean isDebug, long seed) {
protected MixinClientLevel(WritableLevelData worldInfo, ResourceKey<Level> dimension, Holder<DimensionType> dimensionType, Supplier<ProfilerFiller> profiler, boolean isRemote, boolean isDebug, long seed) {
super(worldInfo, dimension, dimensionType, profiler, isRemote, isDebug, seed);
}

1
forge/src/main/java/dev/architectury/registry/block/forge/BlockPropertiesImpl.java
View File

@@ -20,7 +20,6 @@
package dev.architectury.registry.block.forge;
import dev.architectury.registry.block.BlockProperties;
import dev.architectury.registry.block.ToolType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;

27
forge/src/main/java/dev/architectury/registry/level/biome/forge/BiomeModificationsImpl.java
View File

@@ -23,6 +23,8 @@ import com.google.common.collect.Lists;
import dev.architectury.forge.ArchitecturyForge;
import dev.architectury.hooks.level.biome.*;
import dev.architectury.registry.level.biome.BiomeModifications.BiomeContext;
import net.minecraft.core.Holder;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
@@ -45,7 +47,6 @@ import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.BiPredicate;
import java.util.function.Predicate;
import java.util.function.Supplier;
@Mod.EventBusSubscriber(modid = ArchitecturyForge.MOD_ID)
public class BiomeModificationsImpl {
@@ -150,18 +151,18 @@ public class BiomeModificationsImpl {
}
@Override
public @NotNull List<Supplier<ConfiguredWorldCarver<?>>> getCarvers(GenerationStep.Carving carving) {
public Iterable<Holder<ConfiguredWorldCarver<?>>> getCarvers(GenerationStep.Carving carving) {
return generation.getCarvers(carving);
}
@Override
public List<Supplier<PlacedFeature>> getFeatures(GenerationStep.Decoration decoration) {
public Iterable<Holder<PlacedFeature>> getFeatures(GenerationStep.Decoration decoration) {
return generation.getFeatures(decoration);
}
@Override
public @NotNull List<List<Supplier<PlacedFeature>>> getFeatures() {
return generation.features;
public List<Iterable<Holder<PlacedFeature>>> getFeatures() {
return (List<Iterable<Holder<PlacedFeature>>>) (List<?>) generation.features;
}
}
@@ -305,26 +306,26 @@ public class BiomeModificationsImpl {
}
@Override
public Mutable addFeature(GenerationStep.Decoration decoration, PlacedFeature feature) {
public Mutable addFeature(GenerationStep.Decoration decoration, Holder<PlacedFeature> feature) {
generation.addFeature(decoration, feature);
return this;
}
@Override
public Mutable addCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature) {
public Mutable addCarver(GenerationStep.Carving carving, Holder<ConfiguredWorldCarver<?>> feature) {
generation.addCarver(carving, feature);
return this;
}
@Override
public Mutable removeFeature(GenerationStep.Decoration decoration, PlacedFeature feature) {
generation.getFeatures(decoration).removeIf(supplier -> supplier.get() == feature);
public Mutable removeFeature(GenerationStep.Decoration decoration, ResourceKey<PlacedFeature> feature) {
generation.getFeatures(decoration).removeIf(supplier -> supplier.is(feature));
return this;
}
@Override
public Mutable removeCarver(GenerationStep.Carving carving, ConfiguredWorldCarver<?> feature) {
generation.getCarvers(carving).removeIf(supplier -> supplier.get() == feature);
public Mutable removeCarver(GenerationStep.Carving carving, ResourceKey<ConfiguredWorldCarver<?>> feature) {
generation.getCarvers(carving).removeIf(supplier -> supplier.is(feature));
return this;
}
}