A little bit refactor

This commit is contained in:
Aleksey 2020-10-16 23:26:52 +03:00
parent 83dd6e2672
commit f39a0a0482
8 changed files with 25 additions and 23 deletions

View file

@ -17,7 +17,7 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3i; import net.minecraft.util.math.Vec3i;
import ru.betterend.client.ERenderLayer; import ru.betterend.client.ERenderLayer;
import ru.betterend.client.IRenderTypeable; import ru.betterend.client.IRenderTypeable;
import ru.betterend.util.IColorProvider; import ru.betterend.interfaces.IColorProvider;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTypeable, IColorProvider { public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTypeable, IColorProvider {

View file

@ -25,8 +25,8 @@ import net.minecraft.world.LocalDifficulty;
import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.ServerWorldAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import ru.betterend.interfaces.ISlime;
import ru.betterend.registry.BiomeRegistry; import ru.betterend.registry.BiomeRegistry;
import ru.betterend.util.ISlime;
public class EntityEndSlime extends SlimeEntity { public class EntityEndSlime extends SlimeEntity {
private static final TrackedData<Boolean> MOSSY = DataTracker.registerData(EntityEndSlime.class, TrackedDataHandlerRegistry.BOOLEAN); private static final TrackedData<Boolean> MOSSY = DataTracker.registerData(EntityEndSlime.class, TrackedDataHandlerRegistry.BOOLEAN);

View file

@ -1,10 +1,10 @@
package ru.betterend.util; package ru.betterend.interfaces;
import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.block.BlockColorProvider;
import net.minecraft.client.color.item.ItemColorProvider; import net.minecraft.client.color.item.ItemColorProvider;
public interface IColorProvider { public interface IColorProvider {
BlockColorProvider getProvider(); BlockColorProvider getProvider();
ItemColorProvider getItemProvider(); ItemColorProvider getItemProvider();
} }

View file

@ -1,5 +1,5 @@
package ru.betterend.util; package ru.betterend.interfaces;
public interface ISlime { public interface ISlime {
public void setSlimeSize(int size, boolean heal); public void setSlimeSize(int size, boolean heal);
} }

View file

@ -21,7 +21,7 @@ import net.minecraft.client.world.ClientWorld;
import net.minecraft.sound.MusicSound; import net.minecraft.sound.MusicSound;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.world.World; import net.minecraft.world.World;
import ru.betterend.util.IColorProvider; import ru.betterend.interfaces.IColorProvider;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
@Mixin(MinecraftClient.class) @Mixin(MinecraftClient.class)

View file

@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.entity.mob.SlimeEntity; import net.minecraft.entity.mob.SlimeEntity;
import ru.betterend.util.ISlime; import ru.betterend.interfaces.ISlime;
@Mixin(SlimeEntity.class) @Mixin(SlimeEntity.class)
public class SlimeEntityMixin implements ISlime { public class SlimeEntityMixin implements ISlime {

View file

@ -50,9 +50,6 @@ public class FeatureRegistry {
public static final EndFeature FLAVOLITE_LAYER = EndFeature.makeLayerFeature("flavolite_layer", BlockRegistry.FLAVOLITE, 12, 4, 96, 6); public static final EndFeature FLAVOLITE_LAYER = EndFeature.makeLayerFeature("flavolite_layer", BlockRegistry.FLAVOLITE, 12, 4, 96, 6);
public static void registerGlobals(List<List<Supplier<ConfiguredFeature<?, ?>>>> features) { public static void registerGlobals(List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
globalFeatures.add(FLAVOLITE_LAYER);
globalFeatures.add(ENDER_ORE);
globalFeatures.forEach(feature -> { globalFeatures.forEach(feature -> {
int index = feature.getFeatureStep().ordinal(); int index = feature.getFeatureStep().ordinal();
if (features.size() > index) { if (features.size() > index) {
@ -70,4 +67,9 @@ public class FeatureRegistry {
} }
public static void register() {} public static void register() {}
static {
globalFeatures.add(FLAVOLITE_LAYER);
globalFeatures.add(ENDER_ORE);
}
} }

View file

@ -8,7 +8,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.FallingBlock; import net.minecraft.block.FallingBlock;
import net.minecraft.block.Material;
import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.Property; import net.minecraft.state.property.Property;
import net.minecraft.tag.BlockTags; import net.minecraft.tag.BlockTags;
@ -19,6 +18,7 @@ import net.minecraft.util.math.BlockPos.Mutable;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3i; import net.minecraft.util.math.Vec3i;
import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldAccess;
import ru.betterend.blocks.BlockBlueVine; import ru.betterend.blocks.BlockBlueVine;
import ru.betterend.blocks.basis.BlockDoublePlant; import ru.betterend.blocks.basis.BlockDoublePlant;
import ru.betterend.blocks.basis.BlockGlowingFur; import ru.betterend.blocks.basis.BlockGlowingFur;