@@ -49,17 +49,10 @@ public ModRemapperV1Context() {
49
49
50
50
public void init () {
51
51
for (ModRemapper remapper : remappers ) {
52
- Optional <String > pkg = remapper .getDefaultPackage ();
52
+ remapper .getDefaultPackage ().ifPresent (this .mappingsRegistry ::setDefaultPackage );
53
+ remapper .getSourceNamespace ().ifPresent (this .mappingsRegistry ::setSourceNamespace );
53
54
54
- pkg .ifPresent (this .mappingsRegistry ::setDefaultPackage );
55
-
56
- Optional <String > sourceNamespace = remapper .getSourceNamespace ();
57
-
58
- sourceNamespace .ifPresent (this .mappingsRegistry ::setSourceNamespace );
59
-
60
- Optional <Supplier <InputStream >> mappings = remapper .getExtraMapping ();
61
-
62
- mappings .ifPresent (inputStreamSupplier -> {
55
+ remapper .getExtraMapping ().ifPresent (inputStreamSupplier -> {
63
56
try {
64
57
this .mappingsRegistry .addToFormattedMappings (inputStreamSupplier .get (), new HashMap <>());
65
58
} catch (IOException e ) {
@@ -87,7 +80,7 @@ public void init() {
87
80
public void remapMods (Map <ModCandidate , Path > pathMap ) {
88
81
Constants .MAIN_LOGGER .debug ("Starting jar remapping!" );
89
82
SoftLockFixer .preloadClasses ();
90
- TinyRemapper remapper = ModTrRemapper .makeRemapper (this );
83
+ var remapper = ModTrRemapper .makeRemapper (this );
91
84
Constants .MAIN_LOGGER .debug ("Remapper created!" );
92
85
ModTrRemapper .remapMods (remapper , pathMap , this );
93
86
Constants .MAIN_LOGGER .debug ("Jar remapping done!" );
@@ -104,7 +97,7 @@ private List<ModCandidate> collectCandidates(ModDiscovererConfig config, Path mo
104
97
boolean fabric = false ;
105
98
boolean hasClass = false ;
106
99
107
- for (String entry : entries ) {
100
+ for (var entry : entries ) {
108
101
if (entry .endsWith ("fabric.mod.json" ) || entry .endsWith ("quilt.mod.json" ) || entry .endsWith ("quilt.mod.json5" )) {
109
102
fabric = true ;
110
103
break ;
@@ -115,7 +108,7 @@ private List<ModCandidate> collectCandidates(ModDiscovererConfig config, Path mo
115
108
}
116
109
}
117
110
118
- List < ModCandidate > list = new ArrayList <>();
111
+ var list = new ArrayList <ModCandidate >();
119
112
120
113
if (hasClass && !fabric ) {
121
114
list .add (new DefaultModCandidate (modPath , config ));
@@ -126,27 +119,26 @@ private List<ModCandidate> collectCandidates(ModDiscovererConfig config, Path mo
126
119
127
120
@ Override
128
121
public List <ModRemapper > discoverMods (boolean remapClassEdits ) {
129
- Map <String , List <String >> excluded = new HashMap <>();
130
-
131
- Set <String > modFolders = new HashSet <>();
122
+ var excluded = new HashMap <String , List <String >>();
123
+ var modFolders = new HashSet <String >();
132
124
133
- for (ModRemapper remapper : remappers ) {
125
+ for (var remapper : remappers ) {
134
126
Collections .addAll (modFolders , remapper .getJarFolders ());
135
127
136
- if (remapper instanceof V0ModRemapper ) {
137
- excluded .putAll ((( V0ModRemapper ) remapper ) .getExclusions ());
128
+ if (remapper instanceof V0ModRemapper v0Remapper ) {
129
+ excluded .putAll (v0Remapper .getExclusions ());
138
130
}
139
131
}
140
132
141
- List < ModCandidate > candidates = new ArrayList <>();
142
- Map < ModDiscovererConfig , ModDiscoverer > config2Discoverer = new HashMap <>();
133
+ var candidates = new ArrayList <ModCandidate >();
134
+ var config2Discoverer = new HashMap <ModDiscovererConfig , ModDiscoverer >();
143
135
144
- for (String modFolder : modFolders ) {
145
- ModDiscovererConfig config = ModDiscovererConfig .builder (modFolder )
136
+ for (var modFolder : modFolders ) {
137
+ var config = ModDiscovererConfig .builder (modFolder )
146
138
.fileNameMatcher ("(.+).(jar|zip)$" )
147
139
.candidateCollector (this ::collectCandidates )
148
140
.build ();
149
- ModDiscoverer discoverer = new ModDiscoverer (config );
141
+ var discoverer = new ModDiscoverer (config );
150
142
config2Discoverer .put (config , discoverer );
151
143
candidates .addAll (discoverer .collect ());
152
144
}
@@ -157,11 +149,11 @@ public List<ModRemapper> discoverMods(boolean remapClassEdits) {
157
149
throw new RuntimeException (e );
158
150
}
159
151
160
- Map < ModDiscovererConfig , List < ModCandidate >> config2Candidates =
161
- candidates . stream () .collect (Collectors .groupingBy (ModCandidate ::getDiscovererConfig ));
152
+ var config2Candidates = candidates . stream ()
153
+ .collect (Collectors .groupingBy (ModCandidate ::getDiscovererConfig ));
162
154
163
- for (Map . Entry < ModDiscovererConfig , List < ModCandidate >> entry : config2Candidates .entrySet ()) {
164
- ModDiscovererConfig config = entry .getKey ();
155
+ for (var entry : config2Candidates .entrySet ()) {
156
+ var config = entry .getKey ();
165
157
166
158
try {
167
159
config2Discoverer .get (config ).excludeClassEdits (entry .getValue (), this .cacheHandler , this .mappingsRegistry );
@@ -170,16 +162,16 @@ public List<ModRemapper> discoverMods(boolean remapClassEdits) {
170
162
}
171
163
}
172
164
173
- for ( ModCandidate candidate : candidates ) {
174
- mappingsRegistry .addModMappings (candidate .getPath ());
175
- }
165
+ candidates . forEach ( candidate ->
166
+ mappingsRegistry .addModMappings (candidate .getPath ())
167
+ );
176
168
177
169
mappingsRegistry .generateModMappings ();
178
170
179
- Map < ModCandidate , Path > candidateToOutput = new HashMap <>();
171
+ var candidateToOutput = new HashMap <ModCandidate , Path >();
180
172
181
- for (Map . Entry < ModDiscovererConfig , List < ModCandidate >> entry : config2Candidates .entrySet ()) {
182
- ModDiscovererConfig config = entry .getKey ();
173
+ for (var entry : config2Candidates .entrySet ()) {
174
+ var config = entry .getKey ();
183
175
184
176
candidateToOutput .putAll (
185
177
config2Discoverer .get (config ).computeDestinations (entry .getValue (), this .cacheHandler )
@@ -194,10 +186,10 @@ public List<ModRemapper> discoverMods(boolean remapClassEdits) {
194
186
}
195
187
196
188
private void handleV0Excluded (List <ModCandidate > mods , Map <String , List <String >> excludedMap ) throws IOException , URISyntaxException {
197
- for (ModCandidate modCandidate : mods ) {
189
+ for (var modCandidate : mods ) {
198
190
if (excludedMap .containsKey (modCandidate .getId ())) {
199
191
if (Files .isDirectory (modCandidate .getPath ())) {
200
- for (String excluded : excludedMap .get (modCandidate .getId ())) {
192
+ for (var excluded : excludedMap .get (modCandidate .getId ())) {
201
193
if (Files .deleteIfExists (modCandidate .getPath ().resolve (excluded ))) {
202
194
Constants .MAIN_LOGGER .debug ("File deleted: " + modCandidate .getPath ().resolve (excluded ));
203
195
}
@@ -214,12 +206,16 @@ private void handleV0Excluded(List<ModCandidate> mods, Map<String, List<String>>
214
206
215
207
@ Override
216
208
public void gatherRemappers () {
217
- FabricLoader .getInstance ()
209
+ // Collect v0 remappers
210
+ var v0Remappers = FabricLoader .getInstance ()
218
211
.getEntrypoints (v0EntrypointName , fr .catcore .modremapperapi .api .ModRemapper .class )
219
212
.stream ()
220
213
.map (V0ModRemapper ::new )
221
- .forEach (remappers ::add );
214
+ .toList ();
215
+
216
+ remappers .addAll (v0Remappers );
222
217
218
+ // Collect v1 remappers
223
219
remappers .addAll (FabricLoader .getInstance ().getEntrypoints (v1EntrypointName , ModRemapper .class ));
224
220
225
221
if (remappers .size () == 1 ) remappers .clear ();
@@ -271,11 +267,11 @@ public MixinData getMixinData() {
271
267
public void gatherLibraries () {
272
268
libraryHandler .init (this .mappingsRegistry .getSourceNamespace (), this .cacheHandler );
273
269
274
- List < RemapLibrary > libraries = new ArrayList <>();
270
+ var libraries = new ArrayList <RemapLibrary >();
275
271
276
- for ( ModRemapper remapper : remappers ) {
277
- remapper .addRemapLibraries (libraries , FabricLoader .getInstance ().getEnvironmentType ());
278
- }
272
+ remappers . forEach ( remapper ->
273
+ remapper .addRemapLibraries (libraries , FabricLoader .getInstance ().getEnvironmentType ())
274
+ );
279
275
280
276
libraryHandler .cacheLibraries (new ArrayList <>(libraries ));
281
277
}
0 commit comments