Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd
This commit is contained in:
commit
f5130c4e15
2 changed files with 10 additions and 1 deletions
|
@ -1,10 +1,16 @@
|
||||||
package ru.betterend.blocks;
|
package ru.betterend.blocks;
|
||||||
|
|
||||||
|
import net.minecraft.world.gen.feature.Feature;
|
||||||
import ru.betterend.blocks.basis.BlockFeatureSapling;
|
import ru.betterend.blocks.basis.BlockFeatureSapling;
|
||||||
import ru.betterend.registry.FeatureRegistry;
|
import ru.betterend.registry.FeatureRegistry;
|
||||||
|
|
||||||
public class BlockMossyGlowshroomSapling extends BlockFeatureSapling {
|
public class BlockMossyGlowshroomSapling extends BlockFeatureSapling {
|
||||||
public BlockMossyGlowshroomSapling() {
|
public BlockMossyGlowshroomSapling() {
|
||||||
super(FeatureRegistry.MOSSY_GLOWSHROOM, 7);
|
super(7);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Feature<?> getFeature() {
|
||||||
|
return FeatureRegistry.MOSSY_GLOWSHROOM.getFeature();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,9 +8,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
import net.minecraft.world.biome.Biome;
|
import net.minecraft.world.biome.Biome;
|
||||||
import net.minecraft.world.biome.DefaultBiomeCreator;
|
import net.minecraft.world.biome.DefaultBiomeCreator;
|
||||||
import net.minecraft.world.biome.GenerationSettings;
|
import net.minecraft.world.biome.GenerationSettings;
|
||||||
|
<<<<<<< HEAD
|
||||||
import net.minecraft.world.gen.GenerationStep;
|
import net.minecraft.world.gen.GenerationStep;
|
||||||
|
|
||||||
import ru.betterend.registry.FeatureRegistry;
|
import ru.betterend.registry.FeatureRegistry;
|
||||||
|
=======
|
||||||
|
>>>>>>> 9dcf8c34a09f9ca40aa61ba17f5142561e464dbf
|
||||||
|
|
||||||
@Mixin(DefaultBiomeCreator.class)
|
@Mixin(DefaultBiomeCreator.class)
|
||||||
public abstract class DefaultBiomeCreatorMixin {
|
public abstract class DefaultBiomeCreatorMixin {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue