Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes meteorites not spawning when a custom chunk generator is used #5609

Merged
merged 1 commit into from
Oct 29, 2021
Merged

Fixes meteorites not spawning when a custom chunk generator is used #5609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 27 additions & 3 deletions ...ure/DimensionStructuresSettingsMixin.java → ...ins/structure/StructureSettingsMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

package appeng.mixins.structure;

import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

import com.google.common.collect.ImmutableMap;

import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -29,6 +33,7 @@

import net.minecraft.world.level.levelgen.StructureSettings;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration;
import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;

import appeng.worldgen.meteorite.MeteoriteStructure;
Expand All @@ -41,16 +46,35 @@
* If this is not done, Meteorites spawn every chunk, since that is the default for missing entries.
*/
@Mixin(StructureSettings.class)
public class DimensionStructuresSettingsMixin {
public class StructureSettingsMixin {

@Shadow
@Mutable
private static ImmutableMap<StructureFeature<?>, StructureFeatureConfiguration> DEFAULTS;

@Shadow
@Mutable
private Map<StructureFeature<?>, StructureFeatureConfiguration> structureConfig;

@Inject(method = "<clinit>", at = @At("TAIL"))
private static void addMeteoriteSpreadConfig(CallbackInfo ci) {
private static void addDefaultMeteoriteSpreadConfig(CallbackInfo ci) {
DEFAULTS = ImmutableMap.<StructureFeature<?>, StructureFeatureConfiguration>builder().putAll(DEFAULTS)
.put(MeteoriteStructure.INSTANCE, new StructureFeatureConfiguration(32, 8, 124895654)).build();
.put(MeteoriteStructure.INSTANCE, MeteoriteStructure.PLACEMENT_CONFIG)
.build();
}

/**
* This constructor is used if the structure config is deserialized from a datapack.
*/
@Inject(method = "<init>(Ljava/util/Optional;Ljava/util/Map;)V", at = @At("TAIL"))
private void addMeteoriteSpreadConfig(Optional<StrongholdConfiguration> optional,
Map<StructureFeature<?>, StructureFeatureConfiguration> map,
CallbackInfo ci) {
// There's no guarantee the passed map is mutable
structureConfig = new HashMap<>(structureConfig);
if (!structureConfig.containsKey(MeteoriteStructure.INSTANCE)) {
structureConfig.put(MeteoriteStructure.INSTANCE, MeteoriteStructure.PLACEMENT_CONFIG);
}
}

}
4 changes: 4 additions & 0 deletions src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;

import appeng.core.AppEng;

public class MeteoriteStructure extends StructureFeature<NoneFeatureConfiguration> {

public static final StructureFeatureConfiguration PLACEMENT_CONFIG = new StructureFeatureConfiguration(32, 8,
124895654);

public static final ResourceLocation ID = AppEng.makeId("meteorite");

public static final ResourceKey<ConfiguredStructureFeature<?, ?>> KEY = ResourceKey
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/appliedenergistics2.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"mixins": [
"spatial.DimensionTypeMixin",
"spatial.DimensionOptionMixin",
"structure.DimensionStructuresSettingsMixin",
"structure.StructureSettingsMixin",
"structure.ConfiguredStructureFeaturesAccessor",
"feature.ConfiguredFeaturesAccessor",
"feature.LevelLightEngineMixin",
Expand Down