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

1.16.2

Browse Source
This commit is contained in:
gnembon committed 2020-08-11 18:11:55 -03:00
1 parent deea3b7ec4
commit 1c5340232b
4 files changed
+16 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/helpers/FeatureGenerator.java
+7 -6
View File
@@ -19,6 +19,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biomes;
import net.minecraft.world.biome.BuiltInBiomes;
import net.minecraft.world.biome.source.BiomeAccess;
import net.minecraft.world.gen.ChunkRandom;
import net.minecraft.world.gen.chunk.ChunkGenerator;
@@ -53,7 +54,7 @@ public class FeatureGenerator
{
return ((StructureFeatureInterface)structureFeature.feature).plopAnywhere(
world, pos, world.getChunkManager().getChunkGenerator(),
false, world.getRegistryManager().get(Registry.BIOME_KEY).method_31140(Biomes.PLAINS), structureFeature.config);
false, world.getRegistryManager().get(Registry.BIOME_KEY).method_31140(BuiltInBiomes.PLAINS), structureFeature.config);
}
@@ -90,7 +91,7 @@ public class FeatureGenerator
{
return ((StructureFeatureInterface)structureFeature.feature).plopAnywhere(
world, pos, world.getChunkManager().getChunkGenerator(),
true, world.getRegistryManager().get(Registry.BIOME_KEY).method_31140(Biomes.PLAINS), structureFeature.config);
true, Biomes.PLAINS, structureFeature.config);
}
@FunctionalInterface
@@ -197,7 +198,7 @@ public class FeatureGenerator
),
StructurePool.Projection.RIGID
), 6),
Biomes.NETHER_WASTES
BuiltInBiomes.NETHER_WASTES
));
put("bastion_remnant_hoglin_stable", spawnCustomStructure(
StructureFeature.BASTION_REMNANT,
@@ -209,7 +210,7 @@ public class FeatureGenerator
),
StructurePool.Projection.RIGID
), 6),
Biomes.NETHER_WASTES
BuiltInBiomes.NETHER_WASTES
));
put("bastion_remnant_treasure", spawnCustomStructure(
StructureFeature.BASTION_REMNANT,
@@ -221,7 +222,7 @@ public class FeatureGenerator
),
StructurePool.Projection.RIGID
), 6),
Biomes.NETHER_WASTES
BuiltInBiomes.NETHER_WASTES
));
put("bastion_remnant_bridge", spawnCustomStructure(
StructureFeature.BASTION_REMNANT,
@@ -233,7 +234,7 @@ public class FeatureGenerator
),
StructurePool.Projection.RIGID
), 6),
Biomes.NETHER_WASTES
BuiltInBiomes.NETHER_WASTES
));
}};
src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java
+3 -3
View File
@@ -3,13 +3,13 @@ package carpet.mixins;
import carpet.CarpetSettings;
import com.google.common.collect.Lists;
import com.mojang.serialization.Codec;
import net.minecraft.class_5434;
import com.mojang.serialization.Codec;;
import net.minecraft.entity.EntityType;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.SpawnSettings;
import net.minecraft.world.gen.feature.BastionRemnantFeature;
import net.minecraft.world.gen.feature.JigsawFeature;
import net.minecraft.world.gen.feature.StructurePoolFeatureConfig;
import org.spongepowered.asm.mixin.Mixin;
@@ -17,7 +17,7 @@ import java.util.Collections;
import java.util.List;
@Mixin(BastionRemnantFeature.class)
public abstract class BastionRemnantFeatureMixin extends class_5434
public abstract class BastionRemnantFeatureMixin extends JigsawFeature
{
private static final List<SpawnSettings.SpawnEntry> spawnList = Lists.newArrayList(
new SpawnSettings.SpawnEntry(EntityType.PIGLIN_BRUTE, 5, 1, 2),
src/main/java/carpet/mixins/World_movableTEMixin.java
+3 -3
View File
@@ -125,9 +125,9 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces
if ((int_1 & 16) == 0)
{
int int_2 = int_1 & -34;
blockState_2.method_30102(this, blockPos_1, int_2); // prepare
blockState_1.method_30101(this, blockPos_1, int_2); // updateNeighbours
blockState_1.method_30102(this, blockPos_1, int_2); // prepare
blockState_2.prepare(this, blockPos_1, int_2); // prepare
blockState_1.updateNeighbors(this, blockPos_1, int_2); // updateNeighbours
blockState_1.prepare(this, blockPos_1, int_2); // prepare
}
this.onBlockChanged(blockPos_1, blockState_2, blockState_3);
}