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

Fixed some class names

Browse source
This commit is contained in:
Frank Bauer 2021-06-28 12:15:48 +02:00
parent 90f865d1af
commit fb645f8f58
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ru/betterend/registry/EndEntities.java
View file

@ -9,6 +9,7 @@ import net.minecraft.world.entity.EntityDimensions;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EntityType.EntityFactory; import net.minecraft.world.entity.EntityType.EntityFactory;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder; import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder;
import ru.bclib.util.ColorUtil; import ru.bclib.util.ColorUtil;
@ -48,7 +49,7 @@ public class EndEntities {
return type; return type;
} }
private static <T extends LivingEntity> EntityType<T> register(String name, MobCategory group, float width, float height, EntityFactory<T> entity, Builder attributes, boolean fixedSize, int eggColor, int dotsColor) { private static <T extends Mob> EntityType<T> register(String name, MobCategory group, float width, float height, EntityFactory<T> entity, Builder attributes, boolean fixedSize, int eggColor, int dotsColor) {
ResourceLocation id = BetterEnd.makeID(name); ResourceLocation id = BetterEnd.makeID(name);
EntityType<T> type = FabricEntityTypeBuilder.<T>create(group, entity).dimensions(fixedSize ? EntityDimensions.fixed(width, height) : EntityDimensions.scalable(width, height)).build(); EntityType<T> type = FabricEntityTypeBuilder.<T>create(group, entity).dimensions(fixedSize ? EntityDimensions.fixed(width, height) : EntityDimensions.scalable(width, height)).build();
if (Configs.ENTITY_CONFIG.getBooleanRoot(id.getPath(), true)) { if (Configs.ENTITY_CONFIG.getBooleanRoot(id.getPath(), true)) {

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

@ -19,6 +19,7 @@ import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
import ru.bclib.api.BiomeAPI; import ru.bclib.api.BiomeAPI;
import ru.bclib.world.biomes.BCLBiome; import ru.bclib.world.biomes.BCLBiome;
import ru.bclib.world.biomes.BCLBiomeDef; import ru.bclib.world.biomes.BCLBiomeDef;
import ru.bclib.world.features.BCLDecorators;
import ru.bclib.world.features.BCLFeature; import ru.bclib.world.features.BCLFeature;
import ru.bclib.world.features.DefaultFeature; import ru.bclib.world.features.DefaultFeature;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
@ -240,6 +241,8 @@ public class EndFeatures {
public static final DefaultFeature END_STONE_STALAGMITE_CAVEMOSS = new StalactiteFeature(false, EndBlocks.END_STONE_STALACTITE_CAVEMOSS, EndBlocks.CAVE_MOSS); public static final DefaultFeature END_STONE_STALAGMITE_CAVEMOSS = new StalactiteFeature(false, EndBlocks.END_STONE_STALACTITE_CAVEMOSS, EndBlocks.CAVE_MOSS);
public static final DefaultFeature CAVE_PUMPKIN = new CavePumpkinFeature(); public static final DefaultFeature CAVE_PUMPKIN = new CavePumpkinFeature();
private static BCLFeature redisterVegetation(String name, Feature<NoneFeatureConfiguration> feature, int density) { private static BCLFeature redisterVegetation(String name, Feature<NoneFeatureConfiguration> feature, int density) {
return BCLFeature.makeVegetationFeature(BetterEnd.makeID(name), feature, density); return BCLFeature.makeVegetationFeature(BetterEnd.makeID(name), feature, density);
} }

3
src/main/java/ru/betterend/registry/EndItems.java
View file

@ -2,6 +2,7 @@ package ru.betterend.registry;
import java.util.List; import java.util.List;
import net.minecraft.world.entity.Mob;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
@ -175,7 +176,7 @@ public class EndItems extends ItemsRegistry {
return getItemRegistry().registerTool(name, item); return getItemRegistry().registerTool(name, item);
} }
public static Item registerEndEgg(String name, EntityType<?> type, int background, int dots) { public static Item registerEndEgg(String name, EntityType<? extends Mob> type, int background, int dots) {
return getItemRegistry().registerEgg(name, type, background, dots); return getItemRegistry().registerEgg(name, type, background, dots);
} }