k/mc
1
Fork 0
Code Packages Releases 2 Activity

pala M-hunter-3: kills vanilla supplementaires + mergeDefaults config

Browse Source
This commit is contained in:
Anaïs Saraiva
2026-10-19 08:08:17 +02:00
parent 8c3ae8d90e
commit d24d863a64
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mods/pala/src/main/java/fr/surviepote/pala/core/PalaConfig.java
+35 -2
View File
@@ -128,7 +128,15 @@ public final class PalaConfig {
Map.entry("minecraft:squid", new double[]{10, 0}),
Map.entry("minecraft:glow_squid", new double[]{10, 0}),
Map.entry("minecraft:creeper", new double[]{40, 0}),
Map.entry("minecraft:wither", new double[]{1000, 0})));
Map.entry("minecraft:wither", new double[]{1000, 0}),
// M-hunter-3 (wiki evolution chasseur, VERIFIE) : passifs vanilla
// supplementaires (creatures moddees escargot/crabe/serpent/meduse/
// elephant SKIP M8, absentes ; peche "tres variable" + QTE SKIP).
Map.entry("minecraft:goat", new double[]{20, 1}),
Map.entry("minecraft:parrot", new double[]{30, 3}),
Map.entry("minecraft:dolphin", new double[]{35, 5}),
Map.entry("minecraft:turtle", new double[]{40, 8}),
Map.entry("minecraft:panda", new double[]{60, 9})));
// M5a (wiki VERIFIE) : fermier recolte = bloc -> [xp, niveau requis].
// Ble 1.5@0 ("des le niveau 0"), patate 2@2, carotte 2.5@2 (table : Niveau 2 + ligne
@@ -182,6 +190,22 @@ public final class PalaConfig {
private PalaConfig() {
}
// M-hunter-3 : fusionne les entrees par defaut manquantes dans une table
// chargee (nouvelles entrees ajoutees par update sans ecraser les customs admin).
private static <K, V> boolean mergeDefaults(java.util.Map<K, V> cible,
java.util.Map<K, V> defauts) {
boolean added = false;
for (java.util.Map.Entry<K, V> e : defauts.entrySet()) {
if (!cible.containsKey(e.getKey())) {
cible.put(e.getKey(), e.getValue());
added = true;
}
}
return added;
}
private static boolean mergedDefaultsApplied = false;
public static PalaConfig get() {
return instance;
}
@@ -221,14 +245,21 @@ public final class PalaConfig {
if (loaded.rankNodes != null && !loaded.rankNodes.isEmpty()) {
instance.rankNodes = loaded.rankNodes;
}
mergedDefaultsApplied = false;
if (loaded.hunterKills != null && !loaded.hunterKills.isEmpty()) {
java.util.Map __def = new java.util.HashMap<>(instance.hunterKills);
instance.hunterKills = loaded.hunterKills;
mergedDefaultsApplied |= mergeDefaults(instance.hunterKills, __def);
}
if (loaded.farmerHarvest != null && !loaded.farmerHarvest.isEmpty()) {
java.util.Map __def = new java.util.HashMap<>(instance.farmerHarvest);
instance.farmerHarvest = loaded.farmerHarvest;
mergedDefaultsApplied |= mergeDefaults(instance.farmerHarvest, __def);
}
if (loaded.crusherResults != null && !loaded.crusherResults.isEmpty()) {
java.util.Map __def = new java.util.HashMap<>(instance.crusherResults);
instance.crusherResults = loaded.crusherResults;
mergedDefaultsApplied |= mergeDefaults(instance.crusherResults, __def);
}
if (loaded.crusherFuels != null && !loaded.crusherFuels.isEmpty()) {
instance.crusherFuels = loaded.crusherFuels;
@@ -237,7 +268,9 @@ public final class PalaConfig {
instance.crusherInfiniteFuels = loaded.crusherInfiniteFuels;
}
if (loaded.furnaceSmelts != null && !loaded.furnaceSmelts.isEmpty()) {
java.util.Map __def = new java.util.HashMap<>(instance.furnaceSmelts);
instance.furnaceSmelts = loaded.furnaceSmelts;
mergedDefaultsApplied |= mergeDefaults(instance.furnaceSmelts, __def);
}
if (loaded.furnaceFuels != null && !loaded.furnaceFuels.isEmpty()) {
instance.furnaceFuels = loaded.furnaceFuels;
@@ -257,7 +290,7 @@ public final class PalaConfig {
"afkKickMinutes", "rtpCooldownMinutes", "rtpRadius",
"factionMaxClaims", "marketExpiryDays",
"miningZone", "farmlandZone", "maxHomesBase");
boolean complete = true;
boolean complete = !mergedDefaultsApplied;
try (Reader keysReader = Files.newBufferedReader(path)) {
com.google.gson.JsonObject obj =
GSON.fromJson(keysReader, com.google.gson.JsonObject.class);