diff --git a/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java b/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java index a2a5a41c..548e0325 100644 --- a/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java +++ b/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java @@ -16,6 +16,7 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import ru.betterend.blocks.basis.BlockBaseNotFull; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; @@ -79,10 +80,15 @@ public class MengerSpongeWetBlock extends BlockBaseNotFull implements IRenderTyp } } - @Override + /*@Override public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { world.breakBlock(pos, !player.isCreative()); BlocksHelper.setWithUpdate(world, pos, Blocks.AIR); + }*/ + + @Override + public void onBroken(WorldAccess world, BlockPos pos, BlockState state) { + BlocksHelper.setWithUpdate(world, pos, Blocks.AIR); } @Override diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index b64668e1..158c3d1b 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -38,18 +38,18 @@ import ru.betterend.world.biome.cave.EmptySmaragdantCaveBiome; import ru.betterend.world.biome.cave.EndCaveBiome; import ru.betterend.world.biome.cave.LushAuroraCaveBiome; import ru.betterend.world.biome.cave.LushSmaragdantCaveBiome; -import ru.betterend.world.biome.land.BiomeAmberLand; -import ru.betterend.world.biome.land.BiomeBlossomingSpires; -import ru.betterend.world.biome.land.BiomeChorusForest; -import ru.betterend.world.biome.land.BiomeCrystalMountains; -import ru.betterend.world.biome.land.BiomeDustWastelands; -import ru.betterend.world.biome.land.BiomeFoggyMushroomland; -import ru.betterend.world.biome.land.BiomeMegalake; -import ru.betterend.world.biome.land.BiomeMegalakeGrove; -import ru.betterend.world.biome.land.BiomePaintedMountains; -import ru.betterend.world.biome.land.BiomeShadowForest; -import ru.betterend.world.biome.land.BiomeSulphurSprings; -import ru.betterend.world.biome.land.BiomeUmbrellaJungle; +import ru.betterend.world.biome.land.AmberLandBiome; +import ru.betterend.world.biome.land.BlossomingSpiresBiome; +import ru.betterend.world.biome.land.ChorusForestBiome; +import ru.betterend.world.biome.land.CrystalMountainsBiome; +import ru.betterend.world.biome.land.DustWastelandsBiome; +import ru.betterend.world.biome.land.FoggyMushroomlandBiome; +import ru.betterend.world.biome.land.MegalakeBiome; +import ru.betterend.world.biome.land.MegalakeGroveBiome; +import ru.betterend.world.biome.land.PaintedMountainsBiome; +import ru.betterend.world.biome.land.ShadowForestBiome; +import ru.betterend.world.biome.land.SulphurSpringsBiome; +import ru.betterend.world.biome.land.UmbrellaJungleBiome; import ru.betterend.world.biome.land.DragonGraveyardsBiome; import ru.betterend.world.biome.land.DryShrublandBiome; import ru.betterend.world.biome.land.EndBiome; @@ -82,18 +82,18 @@ public class EndBiomes { public static final EndBiome SMALL_END_ISLANDS = registerBiome(BiomeKeys.SMALL_END_ISLANDS, BiomeType.VOID, 1); // Better End Land - public static final EndBiome FOGGY_MUSHROOMLAND = registerBiome(new BiomeFoggyMushroomland(), BiomeType.LAND); - public static final EndBiome CHORUS_FOREST = registerBiome(new BiomeChorusForest(), BiomeType.LAND); - public static final EndBiome DUST_WASTELANDS = registerBiome(new BiomeDustWastelands(), BiomeType.LAND); - public static final EndBiome MEGALAKE = registerBiome(new BiomeMegalake(), BiomeType.LAND); - public static final EndBiome MEGALAKE_GROVE = registerSubBiome(new BiomeMegalakeGrove(), MEGALAKE); - public static final EndBiome CRYSTAL_MOUNTAINS = registerBiome(new BiomeCrystalMountains(), BiomeType.LAND); - public static final EndBiome PAINTED_MOUNTAINS = registerSubBiome(new BiomePaintedMountains(), DUST_WASTELANDS); - public static final EndBiome SHADOW_FOREST = registerBiome(new BiomeShadowForest(), BiomeType.LAND); - public static final EndBiome AMBER_LAND = registerBiome(new BiomeAmberLand(), BiomeType.LAND); - public static final EndBiome BLOSSOMING_SPIRES = registerBiome(new BiomeBlossomingSpires(), BiomeType.LAND); - public static final EndBiome SULPHUR_SPRINGS = registerBiome(new BiomeSulphurSprings(), BiomeType.LAND); - public static final EndBiome UMBRELLA_JUNGLE = registerBiome(new BiomeUmbrellaJungle(), BiomeType.LAND); + public static final EndBiome FOGGY_MUSHROOMLAND = registerBiome(new FoggyMushroomlandBiome(), BiomeType.LAND); + public static final EndBiome CHORUS_FOREST = registerBiome(new ChorusForestBiome(), BiomeType.LAND); + public static final EndBiome DUST_WASTELANDS = registerBiome(new DustWastelandsBiome(), BiomeType.LAND); + public static final EndBiome MEGALAKE = registerBiome(new MegalakeBiome(), BiomeType.LAND); + public static final EndBiome MEGALAKE_GROVE = registerSubBiome(new MegalakeGroveBiome(), MEGALAKE); + public static final EndBiome CRYSTAL_MOUNTAINS = registerBiome(new CrystalMountainsBiome(), BiomeType.LAND); + public static final EndBiome PAINTED_MOUNTAINS = registerSubBiome(new PaintedMountainsBiome(), DUST_WASTELANDS); + public static final EndBiome SHADOW_FOREST = registerBiome(new ShadowForestBiome(), BiomeType.LAND); + public static final EndBiome AMBER_LAND = registerBiome(new AmberLandBiome(), BiomeType.LAND); + public static final EndBiome BLOSSOMING_SPIRES = registerBiome(new BlossomingSpiresBiome(), BiomeType.LAND); + public static final EndBiome SULPHUR_SPRINGS = registerBiome(new SulphurSpringsBiome(), BiomeType.LAND); + public static final EndBiome UMBRELLA_JUNGLE = registerBiome(new UmbrellaJungleBiome(), BiomeType.LAND); public static final EndBiome GLOWING_GRASSLANDS = registerBiome(new GlowingGrasslandsBiome(), BiomeType.LAND); public static final EndBiome DRAGON_GRAVEYARDS = registerBiome(new DragonGraveyardsBiome(), BiomeType.LAND); public static final EndBiome DRY_SHRUBLAND = registerBiome(new DryShrublandBiome(), BiomeType.LAND); diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeAmberLand.java b/src/main/java/ru/betterend/world/biome/land/AmberLandBiome.java similarity index 91% rename from src/main/java/ru/betterend/world/biome/land/BiomeAmberLand.java rename to src/main/java/ru/betterend/world/biome/land/AmberLandBiome.java index f7e28782..d0a23d07 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeAmberLand.java +++ b/src/main/java/ru/betterend/world/biome/land/AmberLandBiome.java @@ -8,8 +8,8 @@ import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; -public class BiomeAmberLand extends EndBiome { - public BiomeAmberLand() { +public class AmberLandBiome extends EndBiome { + public AmberLandBiome() { super(new BiomeDefinition("amber_land") .setFogColor(255, 184, 71) .setFogDensity(2.0F) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeBlossomingSpires.java b/src/main/java/ru/betterend/world/biome/land/BlossomingSpiresBiome.java similarity index 90% rename from src/main/java/ru/betterend/world/biome/land/BiomeBlossomingSpires.java rename to src/main/java/ru/betterend/world/biome/land/BlossomingSpiresBiome.java index e61b2ef4..6226c6f5 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeBlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/land/BlossomingSpiresBiome.java @@ -6,8 +6,8 @@ import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndSounds; -public class BiomeBlossomingSpires extends EndBiome { - public BiomeBlossomingSpires() { +public class BlossomingSpiresBiome extends EndBiome { + public BlossomingSpiresBiome() { super(new BiomeDefinition("blossoming_spires") .setFogColor(241, 146, 229) .setFogDensity(1.7F) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/land/ChorusForestBiome.java similarity index 92% rename from src/main/java/ru/betterend/world/biome/land/BiomeChorusForest.java rename to src/main/java/ru/betterend/world/biome/land/ChorusForestBiome.java index 64c24aec..ecc5ab16 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/land/ChorusForestBiome.java @@ -10,8 +10,8 @@ import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndSounds; -public class BiomeChorusForest extends EndBiome { - public BiomeChorusForest() { +public class ChorusForestBiome extends EndBiome { + public ChorusForestBiome() { super(new BiomeDefinition("chorus_forest") .setFogColor(87, 26, 87) .setFogDensity(1.5F) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeCrystalMountains.java b/src/main/java/ru/betterend/world/biome/land/CrystalMountainsBiome.java similarity index 84% rename from src/main/java/ru/betterend/world/biome/land/BiomeCrystalMountains.java rename to src/main/java/ru/betterend/world/biome/land/CrystalMountainsBiome.java index 7f0a1176..340d865e 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeCrystalMountains.java +++ b/src/main/java/ru/betterend/world/biome/land/CrystalMountainsBiome.java @@ -6,8 +6,8 @@ import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; -public class BiomeCrystalMountains extends EndBiome { - public BiomeCrystalMountains() { +public class CrystalMountainsBiome extends EndBiome { + public CrystalMountainsBiome() { super(new BiomeDefinition("crystal_mountains") .setPlantsColor(255, 133, 211) .setSurface(EndBlocks.CRYSTAL_MOSS) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeDustWastelands.java b/src/main/java/ru/betterend/world/biome/land/DustWastelandsBiome.java similarity index 87% rename from src/main/java/ru/betterend/world/biome/land/BiomeDustWastelands.java rename to src/main/java/ru/betterend/world/biome/land/DustWastelandsBiome.java index 8baa3564..92dd0380 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeDustWastelands.java +++ b/src/main/java/ru/betterend/world/biome/land/DustWastelandsBiome.java @@ -6,8 +6,8 @@ import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndSounds; -public class BiomeDustWastelands extends EndBiome { - public BiomeDustWastelands() { +public class DustWastelandsBiome extends EndBiome { + public DustWastelandsBiome() { super(new BiomeDefinition("dust_wastelands") .setFogColor(226, 239, 168) .setFogDensity(2) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java similarity index 92% rename from src/main/java/ru/betterend/world/biome/land/BiomeFoggyMushroomland.java rename to src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java index bffa77dc..2d6fcc9b 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java @@ -9,8 +9,8 @@ import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; -public class BiomeFoggyMushroomland extends EndBiome { - public BiomeFoggyMushroomland() { +public class FoggyMushroomlandBiome extends EndBiome { + public FoggyMushroomlandBiome() { super(new BiomeDefinition("foggy_mushroomland") .setPlantsColor(73, 210, 209) .setFogColor(41, 122, 173) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeMegalake.java b/src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java similarity index 92% rename from src/main/java/ru/betterend/world/biome/land/BiomeMegalake.java rename to src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java index 01853bbe..c9780367 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeMegalake.java +++ b/src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java @@ -7,8 +7,8 @@ import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; -public class BiomeMegalake extends EndBiome { - public BiomeMegalake() { +public class MegalakeBiome extends EndBiome { + public MegalakeBiome() { super(new BiomeDefinition("megalake") .setPlantsColor(73, 210, 209) .setFogColor(178, 209, 248) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/land/MegalakeGroveBiome.java similarity index 92% rename from src/main/java/ru/betterend/world/biome/land/BiomeMegalakeGrove.java rename to src/main/java/ru/betterend/world/biome/land/MegalakeGroveBiome.java index 03fc5dc3..7e0d0bb1 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/land/MegalakeGroveBiome.java @@ -8,8 +8,8 @@ import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; -public class BiomeMegalakeGrove extends EndBiome { - public BiomeMegalakeGrove() { +public class MegalakeGroveBiome extends EndBiome { + public MegalakeGroveBiome() { super(new BiomeDefinition("megalake_grove") .setPlantsColor(73, 210, 209) .setFogColor(178, 209, 248) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomePaintedMountains.java b/src/main/java/ru/betterend/world/biome/land/PaintedMountainsBiome.java similarity index 86% rename from src/main/java/ru/betterend/world/biome/land/BiomePaintedMountains.java rename to src/main/java/ru/betterend/world/biome/land/PaintedMountainsBiome.java index bef86311..1192d417 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomePaintedMountains.java +++ b/src/main/java/ru/betterend/world/biome/land/PaintedMountainsBiome.java @@ -6,8 +6,8 @@ import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; -public class BiomePaintedMountains extends EndBiome { - public BiomePaintedMountains() { +public class PaintedMountainsBiome extends EndBiome { + public PaintedMountainsBiome() { super(new BiomeDefinition("painted_mountains") .setFogColor(226, 239, 168) .setFogDensity(2) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/land/ShadowForestBiome.java similarity index 92% rename from src/main/java/ru/betterend/world/biome/land/BiomeShadowForest.java rename to src/main/java/ru/betterend/world/biome/land/ShadowForestBiome.java index 62060cdb..b5c28fd9 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/land/ShadowForestBiome.java @@ -8,8 +8,8 @@ import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndSounds; -public class BiomeShadowForest extends EndBiome { - public BiomeShadowForest() { +public class ShadowForestBiome extends EndBiome { + public ShadowForestBiome() { super(new BiomeDefinition("shadow_forest") .setFogColor(0, 0, 0) .setFogDensity(2.5F) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeSulphurSprings.java b/src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java similarity index 90% rename from src/main/java/ru/betterend/world/biome/land/BiomeSulphurSprings.java rename to src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java index e370e5e7..34b704aa 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeSulphurSprings.java +++ b/src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java @@ -7,8 +7,8 @@ import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; import ru.betterend.world.surface.SurfaceBuilders; -public class BiomeSulphurSprings extends EndBiome { - public BiomeSulphurSprings() { +public class SulphurSpringsBiome extends EndBiome { + public SulphurSpringsBiome() { super(new BiomeDefinition("sulphur_springs") .setSurface(SurfaceBuilders.SULPHURIC_SURFACE) .setMusic(EndSounds.MUSIC_OPENSPACE) diff --git a/src/main/java/ru/betterend/world/biome/land/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/land/UmbrellaJungleBiome.java similarity index 92% rename from src/main/java/ru/betterend/world/biome/land/BiomeUmbrellaJungle.java rename to src/main/java/ru/betterend/world/biome/land/UmbrellaJungleBiome.java index 5e969919..60b32cbc 100644 --- a/src/main/java/ru/betterend/world/biome/land/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/land/UmbrellaJungleBiome.java @@ -7,8 +7,8 @@ import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; -public class BiomeUmbrellaJungle extends EndBiome { - public BiomeUmbrellaJungle() { +public class UmbrellaJungleBiome extends EndBiome { + public UmbrellaJungleBiome() { super(new BiomeDefinition("umbrella_jungle") .setFogColor(87, 223, 221) .setWaterAndFogColor(119, 198, 253)