Skip to content

Commit

Permalink
remove trailing space from class matches
Browse files Browse the repository at this point in the history
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Jul 23, 2024
1 parent 708ac7c commit 51237c0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/FindDuplicateMappingFilesTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public abstract class FindDuplicateMappingFilesTask extends DefaultTask {
public static final String TASK_NAME = "findDuplicateMappingFiles";

private static final Logger LOGGER = Logging.getLogger(FindDuplicateMappingFilesTask.class);
private static final Pattern MINECRAFT_CLASS = Pattern.compile("^CLASS net/minecraft/(?:\\w+/)*\\w+ ");
private static final Pattern BLAZE_CLASS = Pattern.compile("^CLASS com/mojang/blaze3d/(?:\\w+/)*\\w+ ");
private static final Pattern MINECRAFT_CLASS = Pattern.compile("^CLASS net/minecraft/(?:\\w+/)*\\w+(?= )");
private static final Pattern BLAZE_CLASS = Pattern.compile("^CLASS com/mojang/blaze3d/(?:\\w+/)*\\w+(?= )");

@InputDirectory
public abstract DirectoryProperty getMappingDirectory();
Expand Down

1 comment on commit 51237c0

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 51237c0, 1 file(s) were updated with 4 line(s) added and 4 removed compared to the latest Quilt Mappings version.

View the diff here: 
Only in namedSrc/net/minecraft/datafixer/fix: AttributeIdFix.java
Only in namedTargetSrc/net/minecraft/datafixer/fix: AttributeModifierIdFix.java
Only in namedTargetSrc/net/minecraft/datafixer/fix: RemoveEmptyItemInBrushableBlockFix.java
Only in namedSrc/net/minecraft/datafixer/fix: RemoveEmptyItemInSuspiciousBlockFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/Schemas.java namedSrc/net/minecraft/datafixer/Schemas.java
--- namedTargetSrc/net/minecraft/datafixer/Schemas.java	2024-07-23 23:47:02.444734506 +0000
+++ namedSrc/net/minecraft/datafixer/Schemas.java	2024-07-23 23:45:51.632975304 +0000
@@ -30,7 +30,7 @@
 import net.minecraft.datafixer.fix.AreaEffectCloudPotionFix;
 import net.minecraft.datafixer.fix.ArrowPickupFix;
 import net.minecraft.datafixer.fix.ArrowStoredWeaponFix;
-import net.minecraft.datafixer.fix.AttributeModifierIdFix;
+import net.minecraft.datafixer.fix.AttributeIdFix;
 import net.minecraft.datafixer.fix.BannerPatternFormatFix;
 import net.minecraft.datafixer.fix.BedBlockEntityFix;
 import net.minecraft.datafixer.fix.BedItemColorFix;
@@ -181,7 +181,7 @@
 import net.minecraft.datafixer.fix.RecipeRenamingFix;
 import net.minecraft.datafixer.fix.RedstoneConnectionsFix;
 import net.minecraft.datafixer.fix.RemapChunkStatusFix;
-import net.minecraft.datafixer.fix.RemoveEmptyItemInBrushableBlockFix;
+import net.minecraft.datafixer.fix.RemoveEmptyItemInSuspiciousBlockFix;
 import net.minecraft.datafixer.fix.RemoveFeatureFlagFix;
 import net.minecraft.datafixer.fix.RemoveGolemGossipFix;
 import net.minecraft.datafixer.fix.RemovePoiValidTagFix;
@@ -1365,7 +1365,7 @@
       Schema schema221 = builder.addSchema(3828, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new EmptyItemInVillagerTradeFix(schema221));
       Schema schema222 = builder.addSchema(3833, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new RemoveEmptyItemInBrushableBlockFix(schema222));
+      builder.addFixer(new RemoveEmptyItemInSuspiciousBlockFix(schema222));
       Schema schema223 = builder.addSchema(3938, Schema3938::new);
       builder.addFixer(new ArrowStoredWeaponFix(schema223));
       Schema schema224 = builder.addSchema(3939, EMPTY_IDENTIFIER_NORMALIZE);
@@ -1373,7 +1373,7 @@
       Schema schema225 = builder.addSchema(3943, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new OptionsMenuBlurrinessFix(schema225));
       Schema schema226 = builder.addSchema(3945, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new AttributeModifierIdFix(schema226));
+      builder.addFixer(new AttributeIdFix(schema226));
       builder.addFixer(new JukeboxTicksSinceSongStartedFix(schema226));
    }

Please sign in to comment.