DemonWav / BuildTools / 9d9ebf6ce53

Commits

md_5 authored 9d9ebf6ce53 23 Dec 2014

Support patches without a prelude.

src/main/java/org/spigotmc/builder/Builder.java

Modified

-239
+        for ( File file : patchDir.listFiles() )
-240
+        {
-241
+            String targetFile = "net/minecraft/server/" + file.getName().replaceAll( ".patch", ".java" );
-242
-243
+            File clean = new File( decompileDir, targetFile );
-244
+            File t = new File( nmsDir.getParentFile(), targetFile );
-245
+            t.getParentFile().mkdirs();
-246
-247
+            System.out.println( "Patching with " + file.getName() );
-248
--
+            Patch parsedPatch = DiffUtils.parseUnifiedDiff( Files.readLines( file, Charsets.UTF_8 ) );
-+
+            List<String> readFile = Files.readLines( file, Charsets.UTF_8 );
-+
-+
+            // Manually append prelude if it is not found in the first few lines.
-+
+            boolean preludeFound = false;
-+
+            for ( int i = 0; i < Math.min( 3, readFile.size() ); i++ )
-+
+            {
-+
+                if ( readFile.get( i ).startsWith( "+++" ) )
-+
+                {
-+
+                    preludeFound = true;
-+
+                    break;
-+
+                }
-+
+            }
-+
+            if ( !preludeFound )
-+
+            {
-+
+                readFile.add( 0, "+++" );
-+
+            }
-+
-+
+            Patch parsedPatch = DiffUtils.parseUnifiedDiff( readFile );
-267
+            List<?> modifiedLines = DiffUtils.patch( Files.readLines( clean, Charsets.UTF_8 ), parsedPatch );
-268
-269
+            BufferedWriter bw = new BufferedWriter( new FileWriter( t ) );
-270
+            for ( String line : (List<String>) modifiedLines )
-271
+            {
-272
+                bw.write( line );
-273
+                bw.newLine();
-274
+            }
-275
+            bw.close();
-276
+        }

BuildTools

Commits

Jira Issues

Add shortcut