Skip to content

Commit

Permalink
fix 'overrides final method' error (#672)
Browse files Browse the repository at this point in the history 
* fix 'overrides final method' error

* update InteractionEntity's tracked data fields to match method name changes
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety authored Dec 4, 2024
1 parent 687d84e commit 3348c94
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions mappings/net/minecraft/entity/InteractionEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ CLASS net/minecraft/unmapped/C_hvnhlgso net/minecraft/entity/InteractionEntity
FIELD f_ckdsvier WIDTH_KEY Ljava/lang/String;
FIELD f_ctyumtqt interaction Lnet/minecraft/unmapped/C_hvnhlgso$C_nzivpjdf;
FIELD f_jzdfpkpp attack Lnet/minecraft/unmapped/C_hvnhlgso$C_nzivpjdf;
FIELD f_luxekrhz HEIGHT Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_rmbogufh WIDTH Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_luxekrhz INTERACTION_HEIGHT Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_rmbogufh INTERACTION_WIDTH Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_vvmxstjr INTERACTION_KEY Ljava/lang/String;
FIELD f_vxdufukm RESPONSE Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_xnjxidmy ATTACK_KEY Ljava/lang/String;
FIELD f_ygkdbibs HEIGHT_KEY Ljava/lang/String;
FIELD f_ztmqbiqd RESPONSE_KEY Ljava/lang/String;
METHOD m_acettnna getDimensions ()Lnet/minecraft/unmapped/C_sszpscpo;
METHOD m_dyvbaohz getHeight ()F
METHOD m_mcajgzfg getWidth ()F
METHOD m_acettnna getInteractionDimensions ()Lnet/minecraft/unmapped/C_sszpscpo;
METHOD m_dyvbaohz getInteractionHeight ()F
METHOD m_mcajgzfg getInteractionWidth ()F
METHOD m_oeurfxnz setResponse (Z)V
ARG 1 response
METHOD m_stegizgr getResponse ()Z
METHOD m_uesbqavb setWidth (F)V
METHOD m_uesbqavb setInteractionWidth (F)V
ARG 1 width
METHOD m_yvnkyldm setHeight (F)V
METHOD m_yvnkyldm setInteractionHeight (F)V
ARG 1 height
CLASS C_nzivpjdf Interaction
FIELD f_dckrisox CODEC Lcom/mojang/serialization/Codec;
Expand Down

1 comment on commit 3348c94

@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 3348c94, 1 file(s) were updated with 28 line(s) added and 28 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/entity/InteractionEntity.java namedSrc/net/minecraft/entity/InteractionEntity.java
--- namedTargetSrc/net/minecraft/entity/InteractionEntity.java	2024-12-04 02:41:57.569508060 +0000
+++ namedSrc/net/minecraft/entity/InteractionEntity.java	2024-12-04 02:40:48.288820829 +0000
@@ -38,14 +38,14 @@
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
     * @mapping {@literal hashed f_rmbogufh Lnet/minecraft/unmapped/C_hvnhlgso;f_rmbogufh:Lnet/minecraft/unmapped/C_rinmcaxy;}
-    * @mapping {@literal named WIDTH Lnet/minecraft/entity/InteractionEntity;WIDTH:Lnet/minecraft/entity/data/TrackedData;}
+    * @mapping {@literal named INTERACTION_WIDTH Lnet/minecraft/entity/InteractionEntity;INTERACTION_WIDTH:Lnet/minecraft/entity/data/TrackedData;}
     */
-   private static final TrackedData<Float> WIDTH = DataTracker.registerData(InteractionEntity.class, TrackedDataHandlerRegistry.FLOAT);
+   private static final TrackedData<Float> INTERACTION_WIDTH = DataTracker.registerData(InteractionEntity.class, TrackedDataHandlerRegistry.FLOAT);
    /**
     * @mapping {@literal hashed f_luxekrhz Lnet/minecraft/unmapped/C_hvnhlgso;f_luxekrhz:Lnet/minecraft/unmapped/C_rinmcaxy;}
-    * @mapping {@literal named HEIGHT Lnet/minecraft/entity/InteractionEntity;HEIGHT:Lnet/minecraft/entity/data/TrackedData;}
+    * @mapping {@literal named INTERACTION_HEIGHT Lnet/minecraft/entity/InteractionEntity;INTERACTION_HEIGHT:Lnet/minecraft/entity/data/TrackedData;}
     */
-   private static final TrackedData<Float> HEIGHT = DataTracker.registerData(InteractionEntity.class, TrackedDataHandlerRegistry.FLOAT);
+   private static final TrackedData<Float> INTERACTION_HEIGHT = DataTracker.registerData(InteractionEntity.class, TrackedDataHandlerRegistry.FLOAT);
    /**
     * @mapping {@literal hashed f_vxdufukm Lnet/minecraft/unmapped/C_hvnhlgso;f_vxdufukm:Lnet/minecraft/unmapped/C_rinmcaxy;}
     * @mapping {@literal named RESPONSE Lnet/minecraft/entity/InteractionEntity;RESPONSE:Lnet/minecraft/entity/data/TrackedData;}
@@ -103,8 +103,8 @@
     */
    @Override
    protected void initDataTracker(DataTracker.Builder arg) {
-      arg.add(WIDTH, 1.0F);
-      arg.add(HEIGHT, 1.0F);
+      arg.add(INTERACTION_WIDTH, 1.0F);
+      arg.add(INTERACTION_HEIGHT, 1.0F);
       arg.add(RESPONSE, false);
    }
 
@@ -114,11 +114,11 @@
    @Override
    protected void readCustomDataFromNbt(NbtCompound arg) {
       if (arg.contains("width", NbtElement.NUMBER_TYPE)) {
-         this.setWidth(arg.getFloat("width"));
+         this.setInteractionWidth(arg.getFloat("width"));
       }
 
       if (arg.contains("height", NbtElement.NUMBER_TYPE)) {
-         this.setHeight(arg.getFloat("height"));
+         this.setInteractionHeight(arg.getFloat("height"));
       }
 
       if (arg.contains("attack")) {
@@ -148,8 +148,8 @@
     */
    @Override
    protected void writeCustomDataToNbt(NbtCompound arg) {
-      arg.putFloat("width", this.getWidth());
-      arg.putFloat("height", this.getHeight());
+      arg.putFloat("width", this.getInteractionWidth());
+      arg.putFloat("height", this.getInteractionHeight());
       if (this.attack != null) {
          InteractionEntity.Interaction.CODEC.encodeStart(NbtOps.INSTANCE, this.attack).ifSuccess(arg2 -> arg.put("attack", arg2));
       }
@@ -167,7 +167,7 @@
    @Override
    public void onTrackedDataSet(TrackedData<?> arg) {
       super.onTrackedDataSet(arg);
-      if (HEIGHT.equals(arg) || WIDTH.equals(arg)) {
+      if (INTERACTION_HEIGHT.equals(arg) || INTERACTION_WIDTH.equals(arg)) {
          this.calculateDimensions();
       }
    }
@@ -269,34 +269,34 @@
 
    /**
     * @mapping {@literal hashed m_uesbqavb Lnet/minecraft/unmapped/C_hvnhlgso;m_uesbqavb(F)V}
-    * @mapping {@literal named setWidth Lnet/minecraft/entity/InteractionEntity;setWidth(F)V}
+    * @mapping {@literal named setInteractionWidth Lnet/minecraft/entity/InteractionEntity;setInteractionWidth(F)V}
     */
-   private void setWidth(float width) {
-      this.dataTracker.set(WIDTH, width);
+   private void setInteractionWidth(float width) {
+      this.dataTracker.set(INTERACTION_WIDTH, width);
    }
 
    /**
     * @mapping {@literal hashed m_mcajgzfg Lnet/minecraft/unmapped/C_hvnhlgso;m_mcajgzfg()F}
-    * @mapping {@literal named getWidth Lnet/minecraft/entity/InteractionEntity;getWidth()F}
+    * @mapping {@literal named getInteractionWidth Lnet/minecraft/entity/InteractionEntity;getInteractionWidth()F}
     */
-   private float getWidth() {
-      return this.dataTracker.get(WIDTH);
+   private float getInteractionWidth() {
+      return this.dataTracker.get(INTERACTION_WIDTH);
    }
 
    /**
     * @mapping {@literal hashed m_yvnkyldm Lnet/minecraft/unmapped/C_hvnhlgso;m_yvnkyldm(F)V}
-    * @mapping {@literal named setHeight Lnet/minecraft/entity/InteractionEntity;setHeight(F)V}
+    * @mapping {@literal named setInteractionHeight Lnet/minecraft/entity/InteractionEntity;setInteractionHeight(F)V}
     */
-   private void setHeight(float height) {
-      this.dataTracker.set(HEIGHT, height);
+   private void setInteractionHeight(float height) {
+      this.dataTracker.set(INTERACTION_HEIGHT, height);
    }
 
    /**
     * @mapping {@literal hashed m_dyvbaohz Lnet/minecraft/unmapped/C_hvnhlgso;m_dyvbaohz()F}
-    * @mapping {@literal named getHeight Lnet/minecraft/entity/InteractionEntity;getHeight()F}
+    * @mapping {@literal named getInteractionHeight Lnet/minecraft/entity/InteractionEntity;getInteractionHeight()F}
     */
-   private float getHeight() {
-      return this.dataTracker.get(HEIGHT);
+   private float getInteractionHeight() {
+      return this.dataTracker.get(INTERACTION_HEIGHT);
    }
 
    /**
@@ -317,10 +317,10 @@
 
    /**
     * @mapping {@literal hashed m_acettnna Lnet/minecraft/unmapped/C_hvnhlgso;m_acettnna()Lnet/minecraft/unmapped/C_sszpscpo;}
-    * @mapping {@literal named getDimensions Lnet/minecraft/entity/InteractionEntity;getDimensions()Lnet/minecraft/entity/EntityDimensions;}
+    * @mapping {@literal named getInteractionDimensions Lnet/minecraft/entity/InteractionEntity;getInteractionDimensions()Lnet/minecraft/entity/EntityDimensions;}
     */
-   private EntityDimensions getDimensions() {
-      return EntityDimensions.changing(this.getWidth(), this.getHeight());
+   private EntityDimensions getInteractionDimensions() {
+      return EntityDimensions.changing(this.getInteractionWidth(), this.getInteractionHeight());
    }
 
    /**
@@ -328,7 +328,7 @@
     */
    @Override
    public EntityDimensions getDimensions(EntityPose pose) {
-      return this.getDimensions();
+      return this.getInteractionDimensions();
    }
 
    /**
@@ -336,7 +336,7 @@
     */
    @Override
    protected Box getDimensionsBoxAt(Vec3d pos) {
-      return this.getDimensions().getBoxAt(pos);
+      return this.getInteractionDimensions().getBoxAt(pos);
    }
 
    /**

Please sign in to comment.