From 6ea4ffe62d78f3d355adc9b69401b559876f5170 Mon Sep 17 00:00:00 2001 From: lax1dude Date: Thu, 30 May 2024 20:18:10 -0700 Subject: [PATCH] Deleted empty patch files --- buildtools/BuildTools.jar | Bin 198652 -> 198863 bytes .../task/diff/EaglerContextRedacted.java | 5 ++++- .../task/diff/MergePullRequest.java | 11 +++++++++-- .../entity/ai/EntityAIBase.edit.java | 8 -------- .../entity/ai/EntityJumpHelper.edit.java | 8 -------- .../entity/ai/EntityLookHelper.edit.java | 8 -------- .../entity/ai/EntityMoveHelper.edit.java | 8 -------- .../entity/ai/EntitySenses.edit.java | 8 -------- .../entity/item/EntityEnderCrystal.edit.java | 8 -------- .../entity/item/EntityEnderPearl.edit.java | 8 -------- .../item/EntityFireworkRocket.edit.java | 8 -------- .../projectile/EntityFishHook.edit.java | 8 -------- .../minecraft/pathfinding/PathPoint.edit.java | 8 -------- .../management/ItemInWorldManager.edit.java | 8 -------- .../village/VillageDoorInfo.edit.java | 8 -------- .../net/minecraft/world/WorldType.edit.java | 8 -------- .../world/demo/DemoWorldManager.edit.java | 8 -------- .../world/gen/ChunkProviderDebug.edit.java | 8 -------- .../world/gen/layer/IntCache.edit.java | 8 -------- .../structure/MapGenStructureData.edit.java | 8 -------- .../structure/StructureBoundingBox.edit.java | 8 -------- .../world/pathfinder/NodeProcessor.edit.java | 8 -------- 22 files changed, 13 insertions(+), 155 deletions(-) delete mode 100644 patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java delete mode 100644 patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java delete mode 100644 patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java delete mode 100644 patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java delete mode 100644 patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/WorldType.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java delete mode 100644 patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar index 9221f54f562707133b887952d87ced25f752e41e..fb427642813bf47fbc725d8f1930c606789300a3 100644 GIT binary patch delta 14816 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 Z`~Nqw=$XIn_@Es)D0JAor6*a4{{abGHgW&} delta 14552 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 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