MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes, green charnia

Browse source
This commit is contained in:
paulevsGitch 2020-12-13 18:51:31 +03:00
parent 4640d1d533
commit 1586667cd8
15 changed files with 54 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java
View file

@ -76,10 +76,12 @@ public class BlockVentBubbleColumn extends BlockBaseNotFull implements FluidDrai
@Environment(EnvType.CLIENT)
public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) {
if (random.nextInt(4) == 0) {
double px = pos.getX() + random.nextDouble();
double py = pos.getY() + random.nextDouble();
double pz = pos.getZ() + random.nextDouble();
world.addImportantParticle(ParticleTypes.BUBBLE_COLUMN_UP, px, py, pz, 0, 0.04, 0);
}
if (random.nextInt(200) == 0) {
world.playSound(pos.getX(), pos.getY(), pos.getZ(), SoundEvents.BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT, SoundCategory.BLOCKS, 0.2F + random.nextFloat() * 0.2F, 0.9F + random.nextFloat() * 0.15F, false);
}

1
src/main/java/ru/betterend/registry/EndBlocks.java
View file

@ -202,6 +202,7 @@ public class EndBlocks {
public static final Block CHARNIA_ORANGE = registerBlock("charnia_orange", new BlockCharnia());
public static final Block CHARNIA_LIGHT_BLUE = registerBlock("charnia_light_blue", new BlockCharnia());
public static final Block CHARNIA_CYAN = registerBlock("charnia_cyan", new BlockCharnia());
public static final Block CHARNIA_GREEN = registerBlock("charnia_green", new BlockCharnia());
public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily());
public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed());

2
src/main/java/ru/betterend/registry/EndFeatures.java
View file

@ -107,7 +107,9 @@ public class EndFeatures {
public static final EndFeature CHARNIA_CYAN = new EndFeature("charnia_cyan", new CharniaFeature(EndBlocks.CHARNIA_CYAN), 10);
public static final EndFeature CHARNIA_LIGHT_BLUE = new EndFeature("charnia_light_blue", new CharniaFeature(EndBlocks.CHARNIA_LIGHT_BLUE), 10);
public static final EndFeature CHARNIA_ORANGE = new EndFeature("charnia_orange", new CharniaFeature(EndBlocks.CHARNIA_ORANGE), 10);
public static final EndFeature CHARNIA_GREEN = new EndFeature("charnia_green", new CharniaFeature(EndBlocks.CHARNIA_GREEN), 10);
public static final EndFeature MENGER_SPONGE = new EndFeature("menger_sponge", new MengerSpongeFeature(5), 1);
public static final EndFeature CHARNIA_RED_RARE = new EndFeature("charnia_red_rare", new CharniaFeature(EndBlocks.CHARNIA_RED), 2);
// Terrain //
public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4);

1
src/main/java/ru/betterend/world/biome/BiomeChorusForest.java
View file

@ -32,6 +32,7 @@ public class BiomeChorusForest extends EndBiome {
.addFeature(EndFeatures.TAIL_MOSS)
.addFeature(EndFeatures.TAIL_MOSS_WOOD)
.addFeature(EndFeatures.CHARNIA_PURPLE)
.addFeature(EndFeatures.CHARNIA_RED_RARE)
.addStructureFeature(ConfiguredStructureFeatures.END_CITY)
.addMobSpawn(EndEntities.END_SLIME, 5, 1, 2)
.addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));

1
src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java
View file

@ -33,6 +33,7 @@ public class BiomeFoggyMushroomland extends EndBiome {
.addFeature(EndFeatures.BUBBLE_CORAL)
.addFeature(EndFeatures.CHARNIA_CYAN)
.addFeature(EndFeatures.CHARNIA_LIGHT_BLUE)
.addFeature(EndFeatures.CHARNIA_RED_RARE)
.addStructureFeature(ConfiguredStructureFeatures.END_CITY)
.addMobSpawn(EndEntities.DRAGONFLY, 80, 2, 5)
.addMobSpawn(EndEntities.END_FISH, 20, 2, 5)

1
src/main/java/ru/betterend/world/biome/BiomeMegalake.java
View file

@ -26,6 +26,7 @@ public class BiomeMegalake extends EndBiome {
.addFeature(EndFeatures.CREEPING_MOSS)
.addFeature(EndFeatures.CHARNIA_CYAN)
.addFeature(EndFeatures.CHARNIA_LIGHT_BLUE)
.addFeature(EndFeatures.CHARNIA_RED_RARE)
.addFeature(EndFeatures.MENGER_SPONGE)
.addMobSpawn(EndEntities.DRAGONFLY, 50, 1, 3)
.addMobSpawn(EndEntities.END_FISH, 50, 3, 8)

1
src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java
View file

@ -29,6 +29,7 @@ public class BiomeMegalakeGrove extends EndBiome {
.addFeature(EndFeatures.CREEPING_MOSS)
.addFeature(EndFeatures.CHARNIA_CYAN)
.addFeature(EndFeatures.CHARNIA_LIGHT_BLUE)
.addFeature(EndFeatures.CHARNIA_RED_RARE)
.addFeature(EndFeatures.MENGER_SPONGE)
.addMobSpawn(EndEntities.DRAGONFLY, 20, 1, 3)
.addMobSpawn(EndEntities.END_FISH, 20, 3, 8)

1
src/main/java/ru/betterend/world/biome/BiomeShadowForest.java
View file

@ -32,6 +32,7 @@ public class BiomeShadowForest extends EndBiome {
.addFeature(EndFeatures.TAIL_MOSS)
.addFeature(EndFeatures.TAIL_MOSS_WOOD)
.addFeature(EndFeatures.CHARNIA_PURPLE)
.addFeature(EndFeatures.CHARNIA_RED_RARE)
.addStructureFeature(ConfiguredStructureFeatures.END_CITY)
.addMobSpawn(EndEntities.SHADOW_WALKER, 80, 2, 4)
.addMobSpawn(EntityType.ENDERMAN, 40, 1, 4)

3
src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java
View file

@ -20,8 +20,9 @@ public class BiomeSulphurSprings extends EndBiome {
.addFeature(EndFeatures.SULPHURIC_LAKE)
.addFeature(EndFeatures.SULPHURIC_CAVE)
.addFeature(EndFeatures.HYDRALUX)
.addFeature(EndFeatures.CHARNIA_GREEN)
.addFeature(EndFeatures.CHARNIA_ORANGE)
.addFeature(EndFeatures.CHARNIA_RED)
.addFeature(EndFeatures.CHARNIA_RED_RARE)
.addMobSpawn(EndEntities.END_FISH, 50, 3, 8)
.addMobSpawn(EndEntities.CUBOZOA, 50, 3, 8)
.addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));

8
src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java
View file

@ -18,6 +18,7 @@ import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import ru.betterend.blocks.BlockHydrothermalVent;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndTags;
import ru.betterend.util.BlocksHelper;
import ru.betterend.util.MHelper;
@ -213,6 +214,13 @@ public class GeyserFeature extends DefaultFeature {
}
}
EndFeatures.SULPHURIC_LAKE.getFeature().generate(world, chunkGenerator, random, pos, null);
double distance = radius1 * 1.7;
BlockPos start = pos.add(-distance, -halfHeight - 15 - distance, -distance);
BlockPos end = pos.add(distance, -halfHeight - 5 + distance, distance);
BlocksHelper.fixBlocks(world, start, end);
return true;
}

10
src/main/resources/assets/betterend/blockstates/charnia_green.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"": [
{ "model": "betterend:block/charnia_green" },
{ "model": "betterend:block/charnia_green", "y": 90 },
{ "model": "betterend:block/charnia_green", "y": 180 },
{ "model": "betterend:block/charnia_green", "y": 270 }
]
}
}

5
src/main/resources/assets/betterend/lang/en_us.json
View file

@ -470,5 +470,8 @@
"block.betterend.dense_snow": "Dense Snow",
"block.betterend.emerald_ice": "Emerald Ice",
"block.betterend.bulb_moss": "Bulb Moss"
"block.betterend.bulb_moss": "Bulb Moss",
"block.betterend.charnia_green": "Charnia Green",
"block.betterend.vent_bubble_column": "Vent Bubble Column"
}

5
src/main/resources/assets/betterend/lang/ru_ru.json
View file

@ -472,5 +472,8 @@
"block.betterend.dense_snow": "Плотный снег",
"block.betterend.emerald_ice": "Изумрудный лёд",
"block.betterend.bulb_moss": "Луковичный мох"
"block.betterend.bulb_moss": "Луковичный мох",
"block.betterend.charnia_green": "Зелёная чарния",
"block.betterend.vent_bubble_column": "Колонна пузырьков гейзера"
}

6
src/main/resources/assets/betterend/models/block/charnia_green.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/charnia",
"textures": {
"texture": "betterend:block/charnia_green"
}
}

6
src/main/resources/assets/betterend/models/item/charnia_green.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/charnia_green"
}
}