eaglercraft/eaglercraft-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deleted empty patch files

Browse Source
This commit is contained in:
lax1dude 2024-05-30 20:18:10 -07:00
parent 79d0e232f6
commit 6ea4ffe62d
22 changed files with 13 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
buildtools/BuildTools.jar
View File

Binary file not shown.

5
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
View File

@ -34,6 +34,10 @@ import com.github.difflib.patch.Patch;
public class EaglerContextRedacted {
public static void writeContextRedacted(Patch<String> patch, PrintWriter output) {
writeContextRedacted(patch.getDeltas(), output);
}
public static void writeContextRedacted(List<AbstractDelta<String>> deltas, PrintWriter output) {
Date theDate = new Date();
output.println();
@ -46,7 +50,6 @@ public class EaglerContextRedacted {
int lastSourcePos = 0;
int lastTargetPos = 0;
List<AbstractDelta<String>> deltas = patch.getDeltas();
delta_itr: for(int i = 0, l = deltas.size(); i < l; ++i) {
AbstractDelta<String> delta = deltas.get(i);

11
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/MergePullRequest.java
View File

@ -28,6 +28,8 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import com.github.difflib.DiffUtils;
import com.github.difflib.patch.AbstractDelta;
import com.github.difflib.patch.DeltaType;
import com.github.difflib.patch.Patch;
import net.lax1dude.eaglercraft.v1_8.buildtools.EaglerBuildToolsConfig;
@ -442,8 +444,13 @@ public class MergePullRequest {
}else {
List<String> oldLines = Lines.linesList(oldStr);
List<String> newLines = Lines.linesList(newStr);
Patch<String> deltas = DiffUtils.diff(oldLines, newLines);
List<AbstractDelta<String>> deltas = DiffUtils.diff(oldLines, newLines).getDeltas();
// hack
if(deltas.size() == 0 || (deltas.size() == 1 && deltas.get(0).getType() == DeltaType.EQUAL)) {
return false;
}
// List<String> diffFile = UnifiedDiffUtils.generateUnifiedDiff(outName, outName, oldLines, deltas, ApplyPatchesToZip.patchContextLength);
//
// if(diffFile.size() == 0) {

8
patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/WorldType.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF

8
patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java
View File

@ -1,8 +0,0 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> EOF