1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
package com.anthonyhilyard.iceberg.mixin;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import com.anthonyhilyard.iceberg.util.DynamicSubconfig;
import com.electronwill.nightconfig.core.CommentedConfig;
import com.electronwill.nightconfig.core.UnmodifiableConfig;
import com.electronwill.nightconfig.core.ConfigSpec.CorrectionAction;
import com.electronwill.nightconfig.core.ConfigSpec.CorrectionListener;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.common.ForgeConfigSpec.ValueSpec;
@Mixin(value = ForgeConfigSpec.class, remap = false)
public class ForgeConfigSpecMixin
{
@Shadow(remap = false)
private Map<List<String>, String> levelComments;
@Shadow(remap = false)
private boolean stringsMatchIgnoringNewlines(@Nullable Object obj1, @Nullable Object obj2) { return false; }
/**
* @author iceberg
* @reason Overwrite the correct method to fix subconfigs not being handled properly.
*/
@Overwrite(remap = false)
private int correct(UnmodifiableConfig spec, CommentedConfig config, LinkedList<String> parentPath, List<String> parentPathUnmodifiable, CorrectionListener listener, CorrectionListener commentListener, boolean dryRun)
{
int count = 0;
Map<String, Object> specMap = spec.valueMap();
Map<String, Object> configMap = config.valueMap();
for (Map.Entry<String, Object> specEntry : specMap.entrySet())
{
final String key = specEntry.getKey();
Object specValue = specEntry.getValue();
final Object configValue = configMap.get(key);
final CorrectionAction action = configValue == null ? CorrectionAction.ADD : CorrectionAction.REPLACE;
parentPath.addLast(key);
String subConfigComment = null;
// If this value is a config, use that as the spec value to support subconfigs.
if (specValue instanceof ValueSpec valueSpec && valueSpec.getDefault() instanceof UnmodifiableConfig)
{
subConfigComment = valueSpec.getComment();
specValue = valueSpec.getDefault();
}
if (specValue instanceof UnmodifiableConfig)
{
if (configValue instanceof CommentedConfig)
{
count += correct((UnmodifiableConfig)specValue, (CommentedConfig)configValue, parentPath, parentPathUnmodifiable, listener, commentListener, dryRun);
if (count > 0 && dryRun)
{
return count;
}
}
else if (dryRun)
{
return 1;
}
else
{
CommentedConfig newValue = config.createSubConfig();
configMap.put(key, newValue);
listener.onCorrect(action, parentPathUnmodifiable, configValue, newValue);
count++;
count += correct((UnmodifiableConfig)specValue, newValue, parentPath, parentPathUnmodifiable, listener, commentListener, dryRun);
}
String newComment = subConfigComment == null ? levelComments.get(parentPath) : subConfigComment;
String oldComment = config.getComment(key);
if (!stringsMatchIgnoringNewlines(oldComment, newComment))
{
if (commentListener != null)
{
commentListener.onCorrect(action, parentPathUnmodifiable, oldComment, newComment);
}
if (dryRun)
{
return 1;
}
config.setComment(key, newComment);
}
}
else
{
ValueSpec valueSpec = (ValueSpec)specValue;
if (!valueSpec.test(configValue))
{
if (dryRun)
{
return 1;
}
Object newValue = valueSpec.correct(configValue);
configMap.put(key, newValue);
listener.onCorrect(action, parentPathUnmodifiable, configValue, newValue);
count++;
}
String oldComment = config.getComment(key);
if (!stringsMatchIgnoringNewlines(oldComment, valueSpec.getComment()))
{
if (commentListener != null)
{
commentListener.onCorrect(action, parentPathUnmodifiable, oldComment, valueSpec.getComment());
}
if (dryRun)
{
return 1;
}
config.setComment(key, valueSpec.getComment());
}
}
parentPath.removeLast();
}
// Second step: removes the unspecified values
for (Iterator<Map.Entry<String, Object>> ittr = configMap.entrySet().iterator(); ittr.hasNext();)
{
Map.Entry<String, Object> entry = ittr.next();
// If the spec is a dynamic subconfig, don't bother checking the spec since that's the point.
if (!(spec instanceof DynamicSubconfig) && !specMap.containsKey(entry.getKey()))
{
if (dryRun)
{
return 1;
}
ittr.remove();
parentPath.addLast(entry.getKey());
listener.onCorrect(CorrectionAction.REMOVE, parentPathUnmodifiable, entry.getValue(), null);
parentPath.removeLast();
count++;
}
}
return count;
}
}
|
