Skip to content

Commit

Permalink
feat: ancient stuff i forgot to commit ages ago
Browse files Browse the repository at this point in the history
  • Loading branch information
Zepalesque committed Sep 26, 2024
1 parent ee65f78 commit 97d1254
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 140 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package net.zepalesque.zenith.mixin.mixins.common;

import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.minecraft.core.HolderGetter;
import net.minecraft.world.level.levelgen.DensityFunction;
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import net.minecraft.world.level.levelgen.NoiseRouter;
import net.minecraft.world.level.levelgen.RandomState;
import net.minecraft.world.level.levelgen.synth.NormalNoise;
import net.zepalesque.zenith.world.density.PerlinNoiseFunction;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;

@Mixin(RandomState.class)
public class RandomStateMixin {
@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/NoiseRouter;mapAll(Lnet/minecraft/world/level/levelgen/DensityFunction$Visitor;)Lnet/minecraft/world/level/levelgen/NoiseRouter;"))
private NoiseRouter init(NoiseRouter instance, DensityFunction.Visitor visitor, Operation<NoiseRouter> original, NoiseGeneratorSettings settings, HolderGetter<NormalNoise.NoiseParameters> noiseParametersGetter, final long levelSeed) {
return original.call(instance, visitor).mapAll(PerlinNoiseFunction.createOrGetVisitor(levelSeed));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@
import net.minecraft.core.HolderSet;
import net.minecraft.core.RegistryCodecs;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.worldgen.BootstapContext;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.util.ExtraCodecs;
import net.minecraft.world.level.biome.Biome;

import java.util.Map;

public class ZenithCodecs {

public static final Codec<Map<Holder<Biome>, Integer>> BIOME_COLOR_MAP = ExtraCodecs.strictUnboundedMap(Biome.CODEC, Codec.INT);


public static final Codec<HolderSet<SoundEvent>> SOUND_EVENT_SET = RegistryCodecs.homogeneousList(Registries.SOUND_EVENT, SoundEvent.DIRECT_CODEC);
}
16 changes: 0 additions & 16 deletions src/main/java/net/zepalesque/zenith/util/holder/HolderUtil.java

This file was deleted.

107 changes: 0 additions & 107 deletions src/main/java/net/zepalesque/zenith/util/holder/KeyHolder.java

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/java/net/zepalesque/zenith/util/holder/KeySetMap.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public PerlinNoiseFunction(NormalNoise.NoiseParameters params, double xzScale, d

public double compute(FunctionContext context) {
if (this.noise == null) {
throw new NullPointerException("Perlin noise has not been initialized yet!");
throw new NullPointerException("PerlinNoiseFunction has not been initialized yet! Please initialize by running mapAll on this function or a parent function with a PerlinNoiseVisitor!");
} else {
return this.noise
.getValue((double)context.blockX() * this.xzScale, (double)context.blockY() * this.yScale, (double)context.blockZ() * this.xzScale);
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/META-INF/accesstransformer.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
public net.minecraft.core.RegistrySetBuilder$UniversalLookup
public net.minecraft.core.RegistrySetBuilder$UniversalLookup holders # holders
3 changes: 2 additions & 1 deletion src/main/resources/zenith.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
"compatibilityLevel": "JAVA_17",
"refmap": "zenith.refmap.json",
"mixins": [
"common.RandomStateMixin",
"common.SharedSuggestionProviderMixin",
"common.accessor.BoatAccessor",
"common.accessor.ChunkAccessAccessor",
"common.accessor.FireAccessor",
"common.accessor.MappedGetterAccessor",
"common.accessor.PerlinNoiseAccessor",
"common.accessor.ReferenceAccessor",
"common.accessor.MappedGetterAccessor",
"common.accessor.registry.RegistryOpsLookupAcessor"
],
"client": [
Expand Down

0 comments on commit 97d1254

Please sign in to comment.