Merge fixes

This commit is contained in:
Sebastian Hartte
2020-08-11 00:09:08 +02:00
121 changed files with 1684 additions and 1995 deletions
@@ -37,6 +37,12 @@ public class MeteoriteStructurePiece extends StructurePiece {
public static final StructurePieceType TYPE = StructurePieceType.register(MeteoriteStructurePiece::new, "ae2mtrt");
public static void register() {
// THIS MUST BE CALLED otherwise the static initializer above will not run,
// unless world generation is actually invoked, which means that chunks may
// be loaded without this being registered as a structure piece!
}
private final PlacedMeteoriteSettings settings;
protected MeteoriteStructurePiece(BlockPos center, float coreRadius, CraterType craterType, FalloutMode fallout,