Skip to content

Commit

Permalink
Mapped some fields and methods in CreakingBrain and CreakingEntity. (#…
Browse files Browse the repository at this point in the history 
…650)

* Mapped some fields and methods in CreakingBrain and CreakingEntity

* Move CreakingBrain and CreakingEntity to net/minecraft/entity/mob

* remove duplicate files

---------

Co-authored-by: ix0rai <[email protected]>
  • Loading branch information
@HyperPigeon @ix0rai
HyperPigeon and ix0rai authored Oct 10, 2024
1 parent 84b1e06 commit b49ee40
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
6 changes: 6 additions & 0 deletions mappings/net/minecraft/entity/mob/CreakingBrain.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/unmapped/C_nkqatzha net/minecraft/entity/mob/CreakingBrain
METHOD m_fdgcwgsd addIdleActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V
METHOD m_hhynauwr addFightActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V
METHOD m_rxjjsjcj create (Lnet/minecraft/unmapped/C_rjqjaxef;)Lnet/minecraft/unmapped/C_rjqjaxef;
METHOD m_suwefzcr addCoreActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V
METHOD m_vpamiunc createProfile ()Lnet/minecraft/unmapped/C_rjqjaxef$C_liifzsnq;
8 changes: 8 additions & 0 deletions mappings/net/minecraft/entity/mob/CreakingEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/unmapped/C_vbugwmii net/minecraft/entity/mob/CreakingEntity
FIELD f_iflztenn attackCooldown I
METHOD m_jkvxeltg createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
METHOD m_ohccomft animate ()V
CLASS C_bhmfzyyn CreakingJumpControl
CLASS C_hkgbvofv CreakingMoveControl
CLASS C_hnlwfmab CreakingLookControl
CLASS C_pukuzfds CreakingBodyControl

1 comment on commit b49ee40

@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 b49ee40, 11 file(s) were updated with 23 line(s) added and 24 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java namedSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java
--- namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java	2024-10-10 16:43:51.943914379 +0000
+++ namedSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java	2024-10-10 16:42:33.947815422 +0000
@@ -14,6 +14,7 @@
 import net.minecraft.entity.mob.BoggedEntity;
 import net.minecraft.entity.mob.BreezeEntity;
 import net.minecraft.entity.mob.CaveSpiderEntity;
+import net.minecraft.entity.mob.CreakingEntity;
 import net.minecraft.entity.mob.CreeperEntity;
 import net.minecraft.entity.mob.DrownedEntity;
 import net.minecraft.entity.mob.ElderGuardianEntity;
@@ -80,7 +81,6 @@
 import net.minecraft.entity.passive.WolfEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.Util;
 import org.slf4j.Logger;
 
@@ -179,8 +179,8 @@
       .put(EntityType.WITHER_SKELETON, AbstractSkeletonEntity.createAttributes().build())
       .put(EntityType.WOLF, WolfEntity.createAttributes().build())
       .put(EntityType.ZOGLIN, ZoglinEntity.createAttributes().build())
-      .put(EntityType.CREAKING, C_vbugwmii.m_jkvxeltg().build())
-      .put(EntityType.CREAKING_TRANSIENT, C_vbugwmii.m_jkvxeltg().build())
+      .put(EntityType.CREAKING, CreakingEntity.createAttributes().build())
+      .put(EntityType.CREAKING_TRANSIENT, CreakingEntity.createAttributes().build())
       .put(EntityType.ZOMBIE, ZombieEntity.createAttributes().build())
       .put(EntityType.ZOMBIE_HORSE, ZombieHorseEntity.createAttributes().build())
       .put(EntityType.ZOMBIE_VILLAGER, ZombieEntity.createAttributes().build())
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-10-10 16:43:51.955914394 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-10-10 16:42:33.955815432 +0000
@@ -30,6 +30,7 @@
 import net.minecraft.entity.mob.BoggedEntity;
 import net.minecraft.entity.mob.BreezeEntity;
 import net.minecraft.entity.mob.CaveSpiderEntity;
+import net.minecraft.entity.mob.CreakingEntity;
 import net.minecraft.entity.mob.CreeperEntity;
 import net.minecraft.entity.mob.DrownedEntity;
 import net.minecraft.entity.mob.ElderGuardianEntity;
@@ -159,7 +160,6 @@
 import net.minecraft.unmapped.C_jkignzdi;
 import net.minecraft.unmapped.C_jquyxssk;
 import net.minecraft.unmapped.C_spthrjmn;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
@@ -510,9 +510,9 @@
     * @mapping {@literal hashed f_cqlokqyz Lnet/minecraft/unmapped/C_ogavsvbr;f_cqlokqyz:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named CREAKING Lnet/minecraft/entity/EntityType;CREAKING:Lnet/minecraft/entity/EntityType;}
     */
-   public static final EntityType<C_vbugwmii> CREAKING = register(
+   public static final EntityType<CreakingEntity> CREAKING = register(
       "creaking",
-      EntityType.Builder.create(C_vbugwmii::new, SpawnGroup.MONSTER)
+      EntityType.Builder.create(CreakingEntity::new, SpawnGroup.MONSTER)
          .makeFireImmune()
          .setDimensions(0.9F, 2.7F)
          .setEyeHeight(2.3F)
Only in namedSrc/net/minecraft/entity/mob: CreakingBrain.java
Only in namedSrc/net/minecraft/entity/mob: CreakingEntity.java
diff -bur namedTargetSrc/net/minecraft/entity/mob/EvokerEntity.java namedSrc/net/minecraft/entity/mob/EvokerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EvokerEntity.java	2024-10-10 16:43:52.087914561 +0000
+++ namedSrc/net/minecraft/entity/mob/EvokerEntity.java	2024-10-10 16:42:34.115815605 +0000
@@ -27,7 +27,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -69,7 +68,7 @@
       this.goalSelector.add(0, new SwimGoal(this));
       this.goalSelector.add(1, new EvokerEntity.LookAtTargetOrWololoTarget());
       this.goalSelector.add(2, new FleeEntityGoal(this, PlayerEntity.class, 8.0F, 0.6, 1.0));
-      this.goalSelector.add(3, new FleeEntityGoal(this, C_vbugwmii.class, 8.0F, 1.0, 1.2));
+      this.goalSelector.add(3, new FleeEntityGoal(this, CreakingEntity.class, 8.0F, 1.0, 1.2));
       this.goalSelector.add(4, new EvokerEntity.SummonVexGoal());
       this.goalSelector.add(5, new EvokerEntity.ConjureFangsGoal());
       this.goalSelector.add(6, new EvokerEntity.WololoGoal());
diff -bur namedTargetSrc/net/minecraft/entity/mob/IllusionerEntity.java namedSrc/net/minecraft/entity/mob/IllusionerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/IllusionerEntity.java	2024-10-10 16:43:51.947914384 +0000
+++ namedSrc/net/minecraft/entity/mob/IllusionerEntity.java	2024-10-10 16:42:33.951815427 +0000
@@ -31,7 +31,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.LocalDifficulty;
@@ -93,7 +92,7 @@
       super.initGoals();
       this.goalSelector.add(0, new SwimGoal(this));
       this.goalSelector.add(1, new SpellcastingIllagerEntity.LookAtTargetGoal());
-      this.goalSelector.add(3, new FleeEntityGoal(this, C_vbugwmii.class, 8.0F, 1.0, 1.2));
+      this.goalSelector.add(3, new FleeEntityGoal(this, CreakingEntity.class, 8.0F, 1.0, 1.2));
       this.goalSelector.add(4, new IllusionerEntity.GiveInvisibilityGoal());
       this.goalSelector.add(5, new IllusionerEntity.BlindTargetGoal());
       this.goalSelector.add(6, new BowAttackGoal<>(this, 0.5, 20, 15.0F));
diff -bur namedTargetSrc/net/minecraft/entity/mob/PillagerEntity.java namedSrc/net/minecraft/entity/mob/PillagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/PillagerEntity.java	2024-10-10 16:43:51.931914363 +0000
+++ namedSrc/net/minecraft/entity/mob/PillagerEntity.java	2024-10-10 16:42:33.927815398 +0000
@@ -39,7 +39,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.village.raid.Raid;
@@ -91,7 +90,7 @@
    protected void initGoals() {
       super.initGoals();
       this.goalSelector.add(0, new SwimGoal(this));
-      this.goalSelector.add(1, new FleeEntityGoal(this, C_vbugwmii.class, 8.0F, 1.0, 1.2));
+      this.goalSelector.add(1, new FleeEntityGoal(this, CreakingEntity.class, 8.0F, 1.0, 1.2));
       this.goalSelector.add(2, new RaiderEntity.PatrolApproachGoal(this, 10.0F));
       this.goalSelector.add(3, new CrossbowAttackGoal<>(this, 1.0, 8.0F));
       this.goalSelector.add(8, new WanderAroundGoal(this, 0.6));
diff -bur namedTargetSrc/net/minecraft/entity/mob/RavagerEntity.java namedSrc/net/minecraft/entity/mob/RavagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/RavagerEntity.java	2024-10-10 16:43:52.027914485 +0000
+++ namedSrc/net/minecraft/entity/mob/RavagerEntity.java	2024-10-10 16:42:34.039815524 +0000
@@ -32,7 +32,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_sfpofsgc;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
@@ -135,7 +134,7 @@
    protected void initGoals() {
       super.initGoals();
       this.goalSelector.add(0, new SwimGoal(this));
-      this.goalSelector.add(3, new FleeEntityGoal(this, C_vbugwmii.class, 8.0F, 1.0, 1.2));
+      this.goalSelector.add(3, new FleeEntityGoal(this, CreakingEntity.class, 8.0F, 1.0, 1.2));
       this.goalSelector.add(4, new MeleeAttackGoal(this, 1.0, true));
       this.goalSelector.add(5, new WanderAroundFarGoal(this, 0.4));
       this.goalSelector.add(6, new LookAtEntityGoal(this, PlayerEntity.class, 6.0F));
diff -bur namedTargetSrc/net/minecraft/entity/mob/VindicatorEntity.java namedSrc/net/minecraft/entity/mob/VindicatorEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/VindicatorEntity.java	2024-10-10 16:43:52.079914550 +0000
+++ namedSrc/net/minecraft/entity/mob/VindicatorEntity.java	2024-10-10 16:42:34.103815592 +0000
@@ -35,7 +35,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_vbugwmii;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.village.raid.Raid;
 import net.minecraft.world.Difficulty;
@@ -81,7 +80,7 @@
    protected void initGoals() {
       super.initGoals();
       this.goalSelector.add(0, new SwimGoal(this));
-      this.goalSelector.add(1, new FleeEntityGoal(this, C_vbugwmii.class, 8.0F, 1.0, 1.2));
+      this.goalSelector.add(1, new FleeEntityGoal(this, CreakingEntity.class, 8.0F, 1.0, 1.2));
       this.goalSelector.add(2, new VindicatorEntity.BreakDoorGoal(this));
       this.goalSelector.add(3, new IllagerEntity.LongDoorInteractGoal(this));
       this.goalSelector.add(4, new RaiderEntity.PatrolApproachGoal(this, 10.0F));
diff -bur namedTargetSrc/net/minecraft/unmapped/C_jkignzdi.java namedSrc/net/minecraft/unmapped/C_jkignzdi.java
--- namedTargetSrc/net/minecraft/unmapped/C_jkignzdi.java	2024-10-10 16:43:52.035914495 +0000
+++ namedSrc/net/minecraft/unmapped/C_jkignzdi.java	2024-10-10 16:42:34.047815532 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.entity.ai.pathing.PathNodeNavigator;
 import net.minecraft.entity.ai.pathing.PathNodeType;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.mob.CreakingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
@@ -27,7 +28,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_jkignzdi}
  * @mapping {@literal named net/minecraft/unmapped/C_jkignzdi}
  */
-public class C_jkignzdi extends C_vbugwmii {
+public class C_jkignzdi extends CreakingEntity {
    /**
     * Mapping not found
     */
@@ -47,7 +48,7 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jkignzdi;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
     * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_jkignzdi;<init>(Lnet/minecraft/entity/EntityType;Lnet/minecraft/world/World;)V}
     */
-   public C_jkignzdi(EntityType<? extends C_vbugwmii> arg, World world) {
+   public C_jkignzdi(EntityType<? extends CreakingEntity> arg, World world) {
       super(arg, world);
    }
 
@@ -241,9 +242,9 @@
    class C_zkhndtpk extends MobNavigation {
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jkignzdi$C_zkhndtpk;<init>(Lnet/minecraft/unmapped/C_jkignzdi;Lnet/minecraft/unmapped/C_vbugwmii;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_jkignzdi$C_zkhndtpk;<init>(Lnet/minecraft/unmapped/C_jkignzdi;Lnet/minecraft/unmapped/C_vbugwmii;Lnet/minecraft/world/World;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_jkignzdi$C_zkhndtpk;<init>(Lnet/minecraft/unmapped/C_jkignzdi;Lnet/minecraft/entity/mob/CreakingEntity;Lnet/minecraft/world/World;)V}
        */
-      C_zkhndtpk(final C_vbugwmii arg2, final World world) {
+      C_zkhndtpk(final CreakingEntity arg2, final World world) {
          super(arg2, world);
       }
 
Only in namedTargetSrc/net/minecraft/unmapped: C_nkqatzha.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_qoieafpc.java namedSrc/net/minecraft/unmapped/C_qoieafpc.java
--- namedTargetSrc/net/minecraft/unmapped/C_qoieafpc.java	2024-10-10 16:43:52.127914611 +0000
+++ namedSrc/net/minecraft/unmapped/C_qoieafpc.java	2024-10-10 16:42:34.167815661 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.MobEntityRenderer;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
+import net.minecraft.entity.mob.CreakingEntity;
 import net.minecraft.util.Identifier;
 
 /**
@@ -13,7 +14,7 @@
  * @mapping {@literal named net/minecraft/unmapped/C_qoieafpc}
  */
 @Environment(EnvType.CLIENT)
-public class C_qoieafpc<T extends C_vbugwmii> extends MobEntityRenderer<T, C_ysxsmpxa, C_dhzkmvjo> {
+public class C_qoieafpc<T extends CreakingEntity> extends MobEntityRenderer<T, C_ysxsmpxa, C_dhzkmvjo> {
    /**
     * Mapping not found
     */
@@ -50,7 +51,7 @@
 
    /**
     * @mapping {@literal hashed m_uigfpsip Lnet/minecraft/unmapped/C_qoieafpc;m_uigfpsip(Lnet/minecraft/unmapped/C_vbugwmii;Lnet/minecraft/unmapped/C_ysxsmpxa;F)V}
-    * @mapping {@literal named m_uigfpsip Lnet/minecraft/unmapped/C_qoieafpc;m_uigfpsip(Lnet/minecraft/unmapped/C_vbugwmii;Lnet/minecraft/unmapped/C_ysxsmpxa;F)V}
+    * @mapping {@literal named m_uigfpsip Lnet/minecraft/unmapped/C_qoieafpc;m_uigfpsip(Lnet/minecraft/entity/mob/CreakingEntity;Lnet/minecraft/unmapped/C_ysxsmpxa;F)V}
     */
    public void m_uigfpsip(T arg, C_ysxsmpxa arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
diff -bur namedTargetSrc/net/minecraft/unmapped/C_sfpofsgc.java namedSrc/net/minecraft/unmapped/C_sfpofsgc.java
--- namedTargetSrc/net/minecraft/unmapped/C_sfpofsgc.java	2024-10-10 16:43:51.943914379 +0000
+++ namedSrc/net/minecraft/unmapped/C_sfpofsgc.java	2024-10-10 16:42:33.943815418 +0000
@@ -16,6 +16,7 @@
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.mob.CreakingEntity;
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -513,7 +514,7 @@
                   && lv3 instanceof LivingEntity
                   && !(lv3 instanceof WaterCreatureEntity)
                   && !(lv3 instanceof PlayerEntity)
-                  && !(lv3 instanceof C_vbugwmii)) {
+                  && !(lv3 instanceof CreakingEntity)) {
                   lv3.startRiding(this);
                } else {
                   this.pushAwayFrom(lv3);
diff -bur namedTargetSrc/net/minecraft/unmapped/C_tkqzsaas.java namedSrc/net/minecraft/unmapped/C_tkqzsaas.java
--- namedTargetSrc/net/minecraft/unmapped/C_tkqzsaas.java	2024-10-10 16:43:52.135914621 +0000
+++ namedSrc/net/minecraft/unmapped/C_tkqzsaas.java	2024-10-10 16:42:34.179815673 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.mob.CreakingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
@@ -287,7 +288,7 @@
    /**
     * Mapping not found
     */
-   public boolean m_zfegalql(C_vbugwmii arg) {
+   public boolean m_zfegalql(CreakingEntity arg) {
       return this.f_txzxukyh == arg;
    }
 
Only in namedTargetSrc/net/minecraft/unmapped: C_vbugwmii.java

Please sign in to comment.