Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Buildtool descriptions #10089

Merged
merged 5 commits into from
Sep 15, 2024
Merged

Buildtool descriptions #10089

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c2f4b7
Reworked building desc in buildtool
someaddons Aug 2, 2024
a405a81
better names
someaddons Aug 2, 2024
d3f5618
add missing desc
Raycoms Sep 14, 2024
7cba654
derp
Raycoms Sep 14, 2024
4ef67b9
two small fixes
Raycoms Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/minecolonies/api/util/constant/TranslationConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,11 @@ public final class TranslationConstants
@NonNls
public static final String BUILDER_BUILDING_TOO_HIGH = "entity.builder.messagebuildtoohigh";
@NonNls
public static final String BUILDER_BUILDING_TOO_LOW = "entity.builder.messagebuildtoolow";
public static final String BUILDER_BUILDING_TOO_LOW = "entity.builder.messagebuildtoolow";
@NonNls
public static final String COLONIST_DESC = "block.blockhuttownhall.messagecolonistdesc";
public static final String CITIZEN_DEATH_DESC = "block.blockhuttownhall.messagecitizendeathdesc";
@NonNls
public static final String WORKER_DESC = "block.blockhuttownhall.messageworkerdesc";
public static final String WORKER_DESC = "block.blockhuttownhall.messageworkerdesc";
@NonNls
public static final String COLONIST_GRAVE_LOCATION = "block.blockhuttownhall.messagecolonistgravelocation";
@NonNls
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/minecolonies/core/colony/events/raid/AbstractShipRaidEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public void onUpdate()
}

// Mark entities when spies exist
if (colony.getRaiderManager().areSpiesEnabled())
if (colony.getRaiderManager().areSpiesEnabled() || spawners.isEmpty())
{
for (final Entity entity : getEntities())
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/minecolonies/core/colony/events/raid/HordeRaidEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
import com.minecolonies.api.entity.citizen.happiness.StaticHappinessSupplier;
import com.minecolonies.api.entity.mobs.AbstractEntityRaiderMob;
import com.minecolonies.api.entity.mobs.RaiderMobUtils;
import com.minecolonies.core.entity.pathfinding.pathresults.PathResult;
import com.minecolonies.api.sounds.RaidSounds;
import com.minecolonies.api.util.*;
import com.minecolonies.api.util.MessageUtils.MessagePriority;
import com.minecolonies.api.util.constant.NbtTagConstants;
import com.minecolonies.core.colony.events.raid.barbarianEvent.Horde;
import com.minecolonies.core.colony.events.raid.pirateEvent.ShipBasedRaiderUtils;
import com.minecolonies.core.entity.pathfinding.pathresults.PathResult;
import com.minecolonies.core.network.messages.client.PlayAudioMessage;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
Expand Down Expand Up @@ -474,7 +474,7 @@ public void onUpdate()
continue;
}

if (colony.getRaiderManager().areSpiesEnabled())
if (colony.getRaiderManager().areSpiesEnabled() || horde.numberOfBosses + horde.numberOfRaiders + horde.numberOfArchers < Math.round(horde.initialSize * 0.15))
{
((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.GLOWING, 550));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/minecolonies/core/entity/citizen/CitizenCombatTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public Component getDeathMessage()
else
{
nameComponent = Component.translatable(
TranslationConstants.COLONIST_DESC,
TranslationConstants.CITIZEN_DEATH_DESC,
citizen.getCitizenData().getName());
}
//CombatTracker#getDeathMessage
Expand Down
Loading