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

Tree rename

Browse source
This commit is contained in:
paulevsGitch 2020-10-13 01:07:47 +03:00
parent bde2ac8291
commit 8286b914d7
138 changed files with 1225 additions and 1263 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ public class BlockRegistry {
public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new BlockMossyGlowshroomHymenophore());
public static final Block MOSSY_GLOWSHROOM_FUR = registerBlock("mossy_glowshroom_fur", new BlockGlowingFur(MOSSY_GLOWSHROOM_SAPLING, 16));
public static final WoodenMaterial MOSSY_GLOWSHROOM = new WoodenMaterial("mossy_glowshroom", MaterialColor.GRAY, MaterialColor.WOOD);
public static final WoodenMaterial CHORUS = new WoodenMaterial("chorus", MaterialColor.MAGENTA, MaterialColor.PURPLE);
public static final WoodenMaterial PYTHADENDRON = new WoodenMaterial("pythadendron", MaterialColor.MAGENTA, MaterialColor.PURPLE);
// Small Plants //
public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new BlockUmbrellaMoss());

4
src/main/java/ru/betterend/registry/FeatureRegistry.java
View file

@ -1,7 +1,7 @@
package ru.betterend.registry;
import ru.betterend.world.features.BlueVineFeature;
import ru.betterend.world.features.ChorusTreeFeature;
import ru.betterend.world.features.PythadendronTreeFeature;
import ru.betterend.world.features.DoublePlantFeature;
import ru.betterend.world.features.EndFeature;
import ru.betterend.world.features.EndLakeFeature;
@ -12,7 +12,7 @@ import ru.betterend.world.features.VineFeature;
public class FeatureRegistry {
// Trees //
public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3);
public static final EndFeature CHORUS_TREE = new EndFeature("chorus_tree", new ChorusTreeFeature(), 1);
public static final EndFeature PYTHADENDRON_TREE = new EndFeature("pythadendron_tree", new PythadendronTreeFeature(), 1);
// Plants //
public static final EndFeature UMBRELLA_MOSS = new EndFeature("umbrella_moss", new DoublePlantFeature(BlockRegistry.UMBRELLA_MOSS, BlockRegistry.UMBRELLA_MOSS_TALL, 5), 5);

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

@ -16,7 +16,7 @@ public class BiomeChorusForest extends EndBiome {
//.setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND)
.addFeature(FeatureRegistry.ENDER_ORE)
.addFeature(FeatureRegistry.RARE_END_LAKE)
.addFeature(FeatureRegistry.CHORUS_TREE)
.addFeature(FeatureRegistry.PYTHADENDRON_TREE)
.addFeature(FeatureRegistry.CHORUS_GRASS)
.addMobSpawn(EntityRegistry.END_SLIME, 5, 1, 2)
.addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));

6
src/main/java/ru/betterend/world/features/ChorusTreeFeature.java → src/main/java/ru/betterend/world/features/PythadendronTreeFeature.java
View file

@ -21,7 +21,7 @@ import ru.betterend.util.sdf.SDF;
import ru.betterend.util.sdf.operator.SDFScale;
import ru.betterend.util.sdf.operator.SDFUnion;
public class ChorusTreeFeature extends DefaultFeature {
public class PythadendronTreeFeature extends DefaultFeature {
private static final Function<BlockState, Boolean> REPLACE;
@Override
@ -36,14 +36,14 @@ public class ChorusTreeFeature extends DefaultFeature {
branch(splines, last.getX(), last.getY(), last.getZ(), size * 0.6F, MHelper.randRange(0, MHelper.PI2, random), random, MHelper.floor(Math.log(size) * 1.5F));
SDF function = SplineHelper.buildSDF(spline, 1.4F, 0.8F, (bpos) -> {
return BlockRegistry.CHORUS.bark.getDefaultState();
return BlockRegistry.PYTHADENDRON.bark.getDefaultState();
});
for (List<Vector3f> sp: splines) {
float width = 0.8F - (sp.get(0).getY() - size) / 40;
if (size > 0F) {
SDF funcSp = SplineHelper.buildSDF(sp, width, width, (bpos) -> {
return BlockRegistry.CHORUS.bark.getDefaultState();
return BlockRegistry.PYTHADENDRON.bark.getDefaultState();
});
function = new SDFUnion().setSourceA(function).setSourceB(funcSp);
}