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

Revert "Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd"

Browse source 
This reverts commit f5130c4e15, reversing
changes made to ccf9943645.
This commit is contained in:
Aleksey 2020-09-30 12:25:54 +03:00
parent f5130c4e15
commit 4703d575c5
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java
View file

@ -1,16 +1,10 @@
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(7); super(FeatureRegistry.MOSSY_GLOWSHROOM, 7);
}
@Override
protected Feature<?> getFeature() {
return FeatureRegistry.MOSSY_GLOWSHROOM.getFeature();
} }
} }

3
src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
View file

@ -8,12 +8,9 @@ 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 {