Skip to content

Commit

Permalink
Couple of Serval and Villager fixes
Browse files Browse the repository at this point in the history 
Fixed too many market stalls
  • Loading branch information
@GirafiStudios
GirafiStudios committed Mar 23, 2021
1 parent b4e9e1f commit 003f4f3
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/teammetallurgy/atum/client/render/entity/mobs/AtumVillagerRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public AtumVillagerRenderer(EntityRendererManager renderManager, IReloadableReso
protected void preRenderCallback(AtumVillagerEntity atumVillagerEntity, @Nonnull MatrixStack matrixStack, float partialTickTime) {
float f = 0.9375F;
if (atumVillagerEntity.isChild()) {
f = (float) ((double) f * 0.5D);
f = (float) ((double) f * 0.8D);
this.shadowSize = 0.25F;
} else {
this.shadowSize = 0.5F;
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/com/teammetallurgy/atum/client/render/entity/mobs/ServalRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public class ServalRenderer extends MobRenderer<ServalEntity, ServalModel<ServalEntity>> {

public ServalRenderer(EntityRendererManager renderManager) {
super(renderManager, new ServalModel<>(0.0F), 0.4F);
super(renderManager, new ServalModel<>(0.0F), 0.5F);
this.addLayer(new ServalCollorLayer(this));
}

Expand All @@ -28,12 +28,6 @@ public ResourceLocation getEntityTexture(ServalEntity entity) {
return entity.getCatTypeName();
}

@Override
protected void preRenderCallback(@Nonnull ServalEntity serval, @Nonnull MatrixStack matrixStack, float partialTickTime) {
super.preRenderCallback(serval, matrixStack, partialTickTime);
matrixStack.scale(0.8F, 0.8F, 0.8F);
}

@Override
protected void applyRotations(@Nonnull ServalEntity serval, @Nonnull MatrixStack matrixStack, float ageInTicks, float rotationYaw, float partialTicks) {
super.applyRotations(serval, matrixStack, ageInTicks, rotationYaw, partialTicks);
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/teammetallurgy/atum/entity/animal/ServalEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import com.teammetallurgy.atum.init.AtumItems;
import com.teammetallurgy.atum.init.AtumLootTables;
import net.minecraft.entity.AgeableEntity;
import net.minecraft.entity.EntitySize;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.Pose;
import net.minecraft.entity.ai.goal.*;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.passive.CatEntity;
Expand Down Expand Up @@ -70,6 +72,11 @@ public boolean isBreedingItem(@Nonnull ItemStack stack) {
return BREEDING_ITEMS.test(stack);
}

@Override
protected float getStandingEyeHeight(@Nonnull Pose pose, @Nonnull EntitySize size) {
return size.height * 0.9F;
}

@Override
@Nonnull
public ResourceLocation getCatTypeName() {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ public void resetMemoryPoint(@Nonnull MemoryModuleType<GlobalPos> moduleType) {
}
}

@Override
protected float getStandingEyeHeight(@Nonnull Pose pose, @Nonnull EntitySize size) {
return this.isChild() ? 0.65F : 1.55F;
}

@Override
protected void updateAITasks() {
super.updateAITasks();
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/teammetallurgy/atum/init/AtumEntities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ public class AtumEntities {
public static final EntityType<QuailEntity> QUAIL = registerMob("quail", 0xCC9B72, 0xA47549, Builder.create(QuailEntity::new, EntityClassification.CREATURE).size(0.35F, 0.525F).trackingRange(10));
public static final EntityType<ScarabEntity> SCARAB = registerMob("scarab", 0x61412C, 0x2F1D10, Builder.create(ScarabEntity::new, EntityClassification.MONSTER).size(0.4F, 0.3F).trackingRange(8));
public static final EntityType<SergeantEntity> SERGEANT = registerMob("sergeant", 0x444444, 0xC2C2C2, Builder.create(SergeantEntity::new, EntityClassification.MONSTER).size(0.6F, 1.8F).trackingRange(8));
public static final EntityType<ServalEntity> SERVAL = registerMob("serval", 0x444444, 0xC2C2C2, Builder.create(ServalEntity::new, EntityClassification.CREATURE).size(0.6F, 0.7F).trackingRange(8));
public static final EntityType<ServalEntity> SERVAL = registerMob("serval", 0x444444, 0xC2C2C2, Builder.create(ServalEntity::new, EntityClassification.CREATURE).size(0.7F, 0.8F).trackingRange(8));
public static final EntityType<StoneguardEntity> STONEGUARD = registerMob("stoneguard", 0x918354, 0x695D37, Builder.create(StoneguardEntity::new, EntityClassification.MONSTER).size(0.6F, 1.8F).immuneToFire().trackingRange(10));
public static final EntityType<StoneguardEntity> STONEGUARD_FRIENDLY = registerEntity("stoneguard_friendly", Builder.create(StoneguardEntity::new, EntityClassification.MISC).size(0.6F, 1.8F).immuneToFire().trackingRange(10));
public static final EntityType<StonewardenEntity> STONEWARDEN = registerMob("stonewarden", 0x918354, 0x695D37, Builder.create(StonewardenEntity::new, EntityClassification.MONSTER).size(1.4F, 2.7F).immuneToFire().trackingRange(10));
public static final EntityType<StonewardenEntity> STONEWARDEN_FRIENDLY = registerEntity("stonewarden_friendly", Builder.create(StonewardenEntity::new, EntityClassification.MISC).size(1.4F, 2.7F).immuneToFire().trackingRange(10));
public static final EntityType<TarantulaEntity> TARANTULA = registerMob("tarantula", 0x745c47, 0xd2b193, Builder.create(TarantulaEntity::new, EntityClassification.MONSTER).size(0.85F, 0.55F).trackingRange(8));
public static final EntityType<WarlordEntity> BANDIT_WARLORD = registerMob("bandit_warlord", 0xa62d1b, 0xe59a22, Builder.create(WarlordEntity::new, EntityClassification.MONSTER).size(0.6F, 1.8F).trackingRange(8));
public static final EntityType<WraithEntity> WRAITH = registerMob("wraith", 0x544d34, 0x3e3927, Builder.create(WraithEntity::new, EntityClassification.MONSTER).size(0.6F, 1.8F));
public static final EntityType<AtumVillagerEntity> VILLAGER_MALE = registerEntity("villager_male", Builder.create(AtumVillagerEntity::new, EntityClassification.MISC).size(0.6F, 1.95F).trackingRange(10));
public static final EntityType<AtumVillagerEntity> VILLAGER_FEMALE = registerEntity("villager_female", Builder.create(AtumVillagerEntity::new, EntityClassification.MISC).size(0.6F, 1.95F).trackingRange(10));
public static final EntityType<AtumVillagerEntity> VILLAGER_MALE = registerEntity("villager_male", Builder.create(AtumVillagerEntity::new, EntityClassification.MISC).size(0.6F, 1.85F).trackingRange(10));
public static final EntityType<AtumVillagerEntity> VILLAGER_FEMALE = registerEntity("villager_female", Builder.create(AtumVillagerEntity::new, EntityClassification.MISC).size(0.6F, 1.85F).trackingRange(10));

//Entities
public static final EntityType<CamelSpitEntity> CAMEL_SPIT = registerEntity("camel_spit", Builder.<CamelSpitEntity>create(CamelSpitEntity::new, EntityClassification.MISC).size(0.25F, 0.25F)
Expand Down Expand Up @@ -145,8 +145,8 @@ public static void addEntityAttributes(EntityAttributeCreationEvent event) {
event.put(STONEWARDEN_FRIENDLY, StoneguardEntity.getAttributes().create());
event.put(TARANTULA, TarantulaEntity.getAttributes().create());
event.put(WRAITH, WraithEntity.getAttributes().create());
event.put(VILLAGER_MALE, AtumVillagerEntity.func_233666_p_().create());
event.put(VILLAGER_FEMALE, AtumVillagerEntity.func_233666_p_().create());
event.put(VILLAGER_MALE, AtumVillagerEntity.registerAttributes().create());
event.put(VILLAGER_FEMALE, AtumVillagerEntity.registerAttributes().create());
}

public static boolean canAnimalSpawn(EntityType<? extends AnimalEntity> animal, IWorld world, SpawnReason spawnReason, BlockPos pos, Random random) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/teammetallurgy/atum/world/gen/feature/pool/GenericVillagePools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ public class GenericVillagePools {
public static void init() {
ResourceLocation terminators = new ResourceLocation(Atum.MOD_ID, "village/generic/terminators");
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/streets"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/straight_1"), 5), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/fourway_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/threeway_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/turn_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/turn_2"), 3)), JigsawPattern.PlacementBehaviour.TERRAIN_MATCHING));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/houses"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_6", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_8", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/animal_pen_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/market_1", ProcessorLists.field_244101_a), 50), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/palm_grove_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/wolf_kennel_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/quail_coop_1", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/houses"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_6", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_8", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/animal_pen_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/market_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/palm_grove_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/wolf_kennel_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/quail_coop_1", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/market_stalls"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_6", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_8", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_9", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_10", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_11", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_12", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_13", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_14", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(terminators, new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/terminators/terminator_1"), 1)), JigsawPattern.PlacementBehaviour.TERRAIN_MATCHING));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/decor"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_1"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_2"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_3"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_4"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/tree_1"), 1), Pair.of(JigsawPiece.func_242864_g(), 10)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/villagers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_male"), 10), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_female"), 10)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/villagers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_female"), 15)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/camels"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/animals/camel"), 1)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/quails"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/animals/quail"), 1)), JigsawPattern.PlacementBehaviour.RIGID));
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/desert_wolfs"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/animals/desert_wolf"), 10), Pair.of(JigsawPiece.func_242849_a("atum:village/animals/alpha_desert_wolf"), 1)), JigsawPattern.PlacementBehaviour.RIGID));
Expand Down

0 comments on commit 003f4f3

Please sign in to comment.