icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

22w07a

Browse Source 
- disabled "sample_noise"
This commit is contained in:
gnembon committed 2022-02-16 22:23:52 +01:00
1 parent aaea11d82d
commit fa1e6ce086
8 files changed
+74 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java
+9 -8
View File
@@ -3,6 +3,13 @@ package carpet.mixins;
import carpet.CarpetSettings;
import carpet.helpers.CustomSpawnLists;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import net.minecraft.world.level.levelgen.feature.NetherFortressFeature;
import net.minecraft.world.level.levelgen.feature.OceanMonumentFeature;
import net.minecraft.world.level.levelgen.feature.PillagerOutpostFeature;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.feature.SwamplandHutFeature;
import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.core.BlockPos;
@@ -15,19 +22,13 @@ import net.minecraft.world.level.biome.MobSpawnSettings;
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.FlatLevelSource;
import net.minecraft.world.level.levelgen.StructureSettings;
import net.minecraft.world.level.levelgen.feature.NetherFortressFeature;
import net.minecraft.world.level.levelgen.feature.OceanMonumentFeature;
import net.minecraft.world.level.levelgen.feature.PillagerOutpostFeature;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.feature.SwamplandHutFeature;
@Mixin(FlatLevelSource.class)
public abstract class FlatLevelSource_structuresMixin extends ChunkGenerator
{
public FlatLevelSource_structuresMixin(BiomeSource biomeSource, StructureSettings structuresConfig)
public FlatLevelSource_structuresMixin(Registry<ConfiguredStructureFeature<?, ?>> registry, BiomeSource biomeSource, StructureSettings structureSettings)
{
super(biomeSource, structuresConfig);
super(registry, biomeSource, structureSettings);
}
@Override
src/main/java/carpet/mixins/NoiseBasedChunkGenerator_husksSpawnMixin.java
+5 -3
View File
@@ -3,6 +3,8 @@ package carpet.mixins;
import carpet.CarpetSettings;
import carpet.helpers.CustomSpawnLists;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -23,9 +25,9 @@ import net.minecraft.world.level.levelgen.feature.StructureFeature;
@Mixin(NoiseBasedChunkGenerator.class)
public abstract class NoiseBasedChunkGenerator_husksSpawnMixin extends ChunkGenerator
{
public NoiseBasedChunkGenerator_husksSpawnMixin(BiomeSource biomeSource, StructureSettings structuresConfig)
{
super(biomeSource, structuresConfig);
public NoiseBasedChunkGenerator_husksSpawnMixin(Registry<ConfiguredStructureFeature<?, ?>> registry, BiomeSource biomeSource, StructureSettings structureSettings) {
super(registry, biomeSource, structureSettings);
}
@Inject(method = "getMobsAt", at = @At("HEAD"), cancellable = true)
src/main/java/carpet/mixins/NoiseSampler_scarpetMixin.java
+10 -4
View File
@@ -4,9 +4,11 @@ import carpet.fakes.NoiseColumnSamplerInterface;
import carpet.script.exception.InternalExpressionException;
import net.minecraft.core.QuartPos;
import net.minecraft.world.level.biome.Climate;
import net.minecraft.world.level.levelgen.NoiseSampler;
import net.minecraft.world.level.levelgen.NoiseRouter;
import net.minecraft.world.level.levelgen.NoiseRouterData;
//import net.minecraft.world.level.levelgen.NoiseSampler;
import net.minecraft.world.level.levelgen.NoiseSettings;
import net.minecraft.world.level.levelgen.TerrainInfo;
//import net.minecraft.world.level.levelgen.TerrainInfo;
import net.minecraft.world.level.levelgen.blending.Blender;
import net.minecraft.world.level.levelgen.synth.BlendedNoise;
import net.minecraft.world.level.levelgen.synth.NoiseUtils;
@@ -17,9 +19,13 @@ import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(NoiseSampler.class)
@Mixin(NoiseRouterData.class)
public abstract class NoiseSampler_scarpetMixin implements NoiseColumnSamplerInterface {
/*
@Shadow @Final
private NoiseRouter router;
@Shadow @Final
private BlendedNoise blendedNoise;
@@ -255,5 +261,5 @@ public abstract class NoiseSampler_scarpetMixin implements NoiseColumnSamplerInt
}
}
throw new InternalExpressionException("Unknown noise type: " + name);
}
}*/
}
src/main/java/carpet/mixins/QuantizedSpaghettiRarityMixin_scarpetMixin.java
+3 -2
View File
@@ -1,11 +1,12 @@
package carpet.mixins;
import net.minecraft.world.level.levelgen.NoiseSampler;
//import net.minecraft.world.level.levelgen.NoiseRouterData;
//import net.minecraft.world.level.levelgen.NoiseSampler;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(NoiseSampler.QuantizedSpaghettiRarity.class)
@Mixin(targets = "net.minecraft.world.level.levelgen.NoiseRouterData$QuantizedSpaghettiRarity")
public interface QuantizedSpaghettiRarityMixin_scarpetMixin {
@Invoker
static double invokeGetSpaghettiRarity3D(double d) {