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

Skill and raid adjustments #10291

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Skill and raid adjustments #10291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/com/minecolonies/api/entity/citizen/citizenhandlers/ICitizenSkillHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.minecolonies.api.colony.ICitizenData;
import com.minecolonies.api.colony.IColony;
import com.minecolonies.api.entity.citizen.Skill;
import com.minecolonies.core.entity.citizen.citizenhandlers.CitizenSkillHandler;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Tuple;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -110,5 +110,5 @@ public interface ICitizenSkillHandler
*
* @return the skills.
*/
Map<Skill, Tuple<Integer, Double>> getSkills();
Map<Skill, CitizenSkillHandler.SkillData> getSkills();
}
7 changes: 7 additions & 0 deletions src/main/java/com/minecolonies/api/research/ILocalResearchTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ public interface ILocalResearchTree
*/
void readFromNBT(final CompoundTag compound, final IResearchEffectManager effects);

/**
* Get the list of all finished researches
*
* @return a copy of the completed list.
*/
List<ResourceLocation> getCompletedList();

/**
* Check if a given research is complete.
* @param location the unique id.
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/minecolonies/core/client/gui/WindowHireWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.minecolonies.core.colony.buildings.moduleviews.PupilBuildingModuleView;
import com.minecolonies.core.colony.buildings.moduleviews.WorkerBuildingModuleView;
import com.minecolonies.core.colony.buildings.views.AbstractBuildingView;
import com.minecolonies.core.entity.citizen.citizenhandlers.CitizenSkillHandler;
import com.minecolonies.core.network.messages.server.colony.citizen.PauseCitizenMessage;
import com.minecolonies.core.network.messages.server.colony.citizen.RestartCitizenMessage;
import com.minecolonies.core.util.BuildingUtils;
Expand All @@ -29,7 +30,6 @@
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.Style;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Tuple;
import org.jetbrains.annotations.NotNull;

import java.util.*;
Expand Down Expand Up @@ -445,13 +445,13 @@ else if ((selectedModule.isFull()) && !selectedModule.getAssignedCitizens().cont
final Skill primary = selectedModule instanceof WorkerBuildingModuleView ? ((WorkerBuildingModuleView) selectedModule).getPrimarySkill() : null;
final Skill secondary = selectedModule instanceof WorkerBuildingModuleView ? ((WorkerBuildingModuleView) selectedModule).getSecondarySkill() : null;

final List<Map.Entry<Skill, Tuple<Integer, Double>>> skills = new ArrayList<>(citizen.getCitizenSkillHandler().getSkills().entrySet());
final List<Map.Entry<Skill, CitizenSkillHandler.SkillData>> skills = new ArrayList<>(citizen.getCitizenSkillHandler().getSkills().entrySet());
skills.sort(Comparator.comparingInt(s -> (s.getKey() == primary ? 1 : (s.getKey() == secondary ? 2 : 3))));

for (final Map.Entry<Skill, Tuple<Integer, Double>> entry : skills)
for (final Map.Entry<Skill, CitizenSkillHandler.SkillData> entry : skills)
{
final String skillName = entry.getKey().name().toLowerCase(Locale.US);
final int skillLevel = entry.getValue().getA();
final int skillLevel = entry.getValue().getLevel();
final Style skillStyle = createColor(primary, secondary, entry.getKey());

textBuilder.append(Component.translatable("com.minecolonies.coremod.gui.citizen.skills." + skillName).setStyle(skillStyle));
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/minecolonies/core/client/gui/citizen/CitizenWindowUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
import com.minecolonies.core.client.gui.AbstractWindowSkeleton;
import com.minecolonies.core.colony.buildings.moduleviews.WorkerBuildingModuleView;
import com.minecolonies.core.colony.buildings.views.AbstractBuildingView;
import com.minecolonies.core.entity.citizen.citizenhandlers.CitizenSkillHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Tuple;
import org.jetbrains.annotations.NotNull;

import java.util.ArrayList;
Expand All @@ -33,8 +34,6 @@
import static com.minecolonies.core.entity.citizen.citizenhandlers.CitizenExperienceHandler.SECONDARY_DEPENDENCY_SHARE;
import static net.minecraft.client.gui.Gui.GUI_ICONS_LOCATION;

import net.minecraft.network.chat.Component;

/**
* BOWindow for the citizen.
*/
Expand Down Expand Up @@ -387,10 +386,10 @@ public static void createHappinessBar(final ICitizenDataView citizen, final Abst
public static void createSkillContent(final ICitizenDataView citizen, final AbstractWindowSkeleton window)
{
final boolean isCreative = Minecraft.getInstance().player.isCreative();
for (final Map.Entry<Skill, Tuple<Integer, Double>> entry : citizen.getCitizenSkillHandler().getSkills().entrySet())
for (final Map.Entry<Skill, CitizenSkillHandler.SkillData> entry : citizen.getCitizenSkillHandler().getSkills().entrySet())
{
final String id = entry.getKey().name().toLowerCase(Locale.US);
window.findPaneOfTypeByID(id, Text.class).setText(Component.literal(Integer.toString(entry.getValue().getA())));
window.findPaneOfTypeByID(id, Text.class).setText(Component.literal(Integer.toString(entry.getValue().getLevel())));

final Pane buttons = window.findPaneByID(id + "_bts");
if (buttons != null)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/minecolonies/core/client/gui/townhall/WindowCitizenPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import com.minecolonies.api.entity.citizen.Skill;
import com.minecolonies.core.Network;
import com.minecolonies.core.colony.buildings.workerbuildings.BuildingTownHall;
import com.minecolonies.core.entity.citizen.citizenhandlers.CitizenSkillHandler;
import com.minecolonies.core.network.messages.server.colony.citizen.RecallSingleCitizenMessage;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Tuple;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.Pose;
import org.jetbrains.annotations.NotNull;
Expand All @@ -23,7 +23,7 @@
import java.text.DecimalFormat;
import java.util.*;

import static com.minecolonies.api.util.constant.TranslationConstants.*;
import static com.minecolonies.api.util.constant.TranslationConstants.PARTIAL_HAPPINESS_MODIFIER_NAME;
import static com.minecolonies.api.util.constant.WindowConstants.*;

/**
Expand Down Expand Up @@ -188,10 +188,10 @@ public void updateElement(final int index, @NotNull final Pane rowPane)
button.setText(Component.literal(citizen.getName()));

final AbstractTextBuilder.TextBuilder textBuilder = PaneBuilders.textBuilder();
for (final Map.Entry<Skill, Tuple<Integer, Double>> entry : citizen.getCitizenSkillHandler().getSkills().entrySet())
for (final Map.Entry<Skill, CitizenSkillHandler.SkillData> entry : citizen.getCitizenSkillHandler().getSkills().entrySet())
{
final String skillName = entry.getKey().name().toLowerCase(Locale.US);
final int skillLevel = entry.getValue().getA();
final int skillLevel = entry.getValue().getLevel();

textBuilder.append(Component.translatable("com.minecolonies.coremod.gui.citizen.skills." + skillName));
textBuilder.append(Component.literal(": " + skillLevel + " "));
Expand Down
Loading