diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar index 9221f54..fb42764 100644 Binary files a/buildtools/BuildTools.jar and b/buildtools/BuildTools.jar differ diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java index c938a8c..12414eb 100644 --- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java +++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java @@ -34,6 +34,10 @@ import com.github.difflib.patch.Patch; public class EaglerContextRedacted { public static void writeContextRedacted(Patch patch, PrintWriter output) { + writeContextRedacted(patch.getDeltas(), output); + } + + public static void writeContextRedacted(List> deltas, PrintWriter output) { Date theDate = new Date(); output.println(); @@ -46,7 +50,6 @@ public class EaglerContextRedacted { int lastSourcePos = 0; int lastTargetPos = 0; - List> deltas = patch.getDeltas(); delta_itr: for(int i = 0, l = deltas.size(); i < l; ++i) { AbstractDelta delta = deltas.get(i); diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/MergePullRequest.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/MergePullRequest.java index b3790b8..6c2666b 100644 --- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/MergePullRequest.java +++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/MergePullRequest.java @@ -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 oldLines = Lines.linesList(oldStr); List newLines = Lines.linesList(newStr); - Patch deltas = DiffUtils.diff(oldLines, newLines); - + List> deltas = DiffUtils.diff(oldLines, newLines).getDeltas(); + + // hack + if(deltas.size() == 0 || (deltas.size() == 1 && deltas.get(0).getType() == DeltaType.EQUAL)) { + return false; + } + // List diffFile = UnifiedDiffUtils.generateUnifiedDiff(outName, outName, oldLines, deltas, ApplyPatchesToZip.patchContextLength); // // if(diffFile.size() == 0) { diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java b/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java b/patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/WorldType.edit.java b/patches/minecraft/net/minecraft/world/WorldType.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/WorldType.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java b/patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF diff --git a/patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java b/patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java deleted file mode 100644 index 7572609..0000000 --- a/patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java +++ /dev/null @@ -1,8 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> EOF