Skip to content

Commit

Permalink
Update enigma to 1.8.4 (#450)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mysterious-Dev
Mysterious-Dev authored Jun 21, 2023
1 parent b4dec76 commit 92bcfce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ download_task = "4.1.1"
guava = "31.1-jre"
jackson_xml = "2.14.1"
launchermeta_parser = "1.0.0"
enigma = "1.8.2"
enigma = "1.8.4"
enigma_plugin = "1.2.2"
tiny_remapper = "0.7.2"
stitch = "0.6.1"
Expand Down

1 comment on commit 92bcfce

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit 92bcfce, 7 file(s) were updated with 21 line(s) added and 21 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-06-21 22:20:05.333366843 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-06-21 22:18:14.499343195 +0000
@@ -202,7 +202,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-06-21 22:20:05.413374035 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-06-21 22:18:14.591352371 +0000
@@ -616,7 +616,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-06-21 22:20:05.293363240 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-06-21 22:18:14.451338407 +0000
@@ -727,7 +727,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-06-21 22:20:05.409373676 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-06-21 22:18:14.587351972 +0000
@@ -406,13 +406,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.active
          && this.visible
-         && mouseX >= (double)this.getX()
-         && mouseY >= (double)this.getY()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && e >= (double)this.getY()
+         && d < (double)(this.getX() + this.width)
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-06-21 22:20:05.281362159 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-06-21 22:18:14.439337211 +0000
@@ -683,8 +683,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
-      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
+   public boolean isMouseOver(double d, double e) {
+      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
    }
 
    /**
@@ -957,8 +957,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double mouseX, double mouseY) {
-         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
+      public boolean isMouseOver(double d, double e) {
+         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-06-21 22:20:05.293363240 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-06-21 22:18:14.455338806 +0000
@@ -749,12 +749,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.visible
-         && mouseX >= (double)this.getX()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY >= (double)this.getY()
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && d < (double)(this.getX() + this.width)
+         && e >= (double)this.getY()
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/item/SmithingTemplateItem.java namedSrc/net/minecraft/item/SmithingTemplateItem.java
--- namedTargetSrc/net/minecraft/item/SmithingTemplateItem.java	2023-06-21 22:20:05.357369005 +0000
+++ namedSrc/net/minecraft/item/SmithingTemplateItem.java	2023-06-21 22:18:14.527345987 +0000
@@ -122,9 +122,9 @@
    private static final Identifier CHESTPLATE_ICON = new Identifier("item/empty_armor_slot_chestplate");
    /**
     * @mapping {@literal hashed f_rstahxkr Lnet/minecraft/unmapped/C_hkwshalt;f_rstahxkr:Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named LEGGINS_ICON Lnet/minecraft/item/SmithingTemplateItem;LEGGINS_ICON:Lnet/minecraft/util/Identifier;}
+    * @mapping {@literal named LEGGINGS_ICON Lnet/minecraft/item/SmithingTemplateItem;LEGGINGS_ICON:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier LEGGINS_ICON = new Identifier("item/empty_armor_slot_leggings");
+   private static final Identifier LEGGINGS_ICON = new Identifier("item/empty_armor_slot_leggings");
    /**
     * @mapping {@literal hashed f_wuabevel Lnet/minecraft/unmapped/C_hkwshalt;f_wuabevel:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BOOTS_ICON Lnet/minecraft/item/SmithingTemplateItem;BOOTS_ICON:Lnet/minecraft/util/Identifier;}
@@ -294,7 +294,7 @@
     * @mapping {@literal named getArmorIcons Lnet/minecraft/item/SmithingTemplateItem;getArmorIcons()Ljava/util/List;}
     */
    private static List<Identifier> getArmorIcons() {
-      return List.of(HELMET_ICON, CHESTPLATE_ICON, LEGGINS_ICON, BOOTS_ICON);
+      return List.of(HELMET_ICON, CHESTPLATE_ICON, LEGGINGS_ICON, BOOTS_ICON);
    }
 
    /**
@@ -310,7 +310,7 @@
     * @mapping {@literal named getNetheriteUpgradeIcons Lnet/minecraft/item/SmithingTemplateItem;getNetheriteUpgradeIcons()Ljava/util/List;}
     */
    private static List<Identifier> getNetheriteUpgradeIcons() {
-      return List.of(HELMET_ICON, SWORD_ICON, CHESTPLATE_ICON, PICKAXE_ICON, LEGGINS_ICON, AXE_ICON, BOOTS_ICON, HOE_ICON, SHOVEL_ICON);
+      return List.of(HELMET_ICON, SWORD_ICON, CHESTPLATE_ICON, PICKAXE_ICON, LEGGINGS_ICON, AXE_ICON, BOOTS_ICON, HOE_ICON, SHOVEL_ICON);
    }
 
    /**

Please sign in to comment.