Skip to content

Commit

Permalink
Added some mapping (#461)
Browse files Browse the repository at this point in the history 
* New Mappings added

* Update mappings/net/minecraft/client/realms/gui/screen/RealmsInfoScrollableWidget.mapping

Co-authored-by: ix0rai <[email protected]>

* Applied fixes and fixed javadoc jar error

* Reverted mapping I misunderstood

---------

Co-authored-by: ix0rai <[email protected]>
  • Loading branch information
@defeef @ix0rai
defeef and ix0rai committed Jul 7, 2023
1 parent 94d92bd commit 3bf3f67
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 0 deletions.
10 changes: 10 additions & 0 deletions mappings/net/minecraft/client/gui/widget/MultilineScrollableWidget.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CLASS net/minecraft/unmapped/C_qnehaoor net/minecraft/client/gui/widget/MultilineScrollableWidget
FIELD f_pmtdrgtz multilineTextWidget Lnet/minecraft/unmapped/C_ivtezidq;
METHOD <init> (IIIILnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_mavozmpp;)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 text
METHOD m_jclajfmw withTextColor (I)Lnet/minecraft/unmapped/C_qnehaoor;
ARG 1 color
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/unmapped/C_zmyqzgre net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen
FIELD f_bvtcdylt TIME_LEFT_LABEL_TEXT Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_cpodamdj startDate Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_ilaidvjv RECURRING_SUBSCRIPTION_INFO Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_irdxpwpl parent Lnet/minecraft/unmapped/C_wrmtlwqx;
FIELD f_iskbgrsv type Lnet/minecraft/unmapped/C_guwepadk$C_eeqsqtcu;
FIELD f_jmapajpe SUBSCRIPTION_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/world/ClientWorld.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ CLASS net/minecraft/unmapped/C_ghdnlrrw net/minecraft/client/world/ClientWorld
METHOD m_fbbmqzbb tickEntities ()V
METHOD m_fsnivgsu (Lnet/minecraft/unmapped/C_hynzadkk;)I
ARG 1 pos
METHOD m_ftefeyzd (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;I)V
ARG 3 flags
METHOD m_futjdoxn getStarBrightness (F)F
ARG 1 tickDelta
METHOD m_giiosqzp getEntities ()Ljava/lang/Iterable;
Expand Down
8 changes: 8 additions & 0 deletions mappings/net/minecraft/entity/ai/brain/PrioritizedEntry.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/unmapped/C_tpkdljtb net/minecraft/entity/ai/brain/PrioritizedEntry
FIELD f_jithxsae priority F
FIELD f_rzkvctic startTime I
METHOD <init> (IF)V
ARG 1 startTime
ARG 2 priority
METHOD m_asttoyza getStartTime ()I
METHOD m_snmbvtrs getPriority ()F
1 change: 1 addition & 0 deletions mappings/net/minecraft/structure/Structure.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ CLASS net/minecraft/unmapped/C_abvlwuej net/minecraft/structure/Structure
ARG 2 nbt
METHOD m_ivbqhzzt getAuthor ()Ljava/lang/String;
METHOD m_knhfsvff process (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mhhynxof;Ljava/util/List;)Ljava/util/List;
ARG 0 worldAccess
ARG 1 pos
ARG 2 pivot
ARG 3 placementData
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/structure/processor/CappedStructureProcessor.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_irbfsoxo net/minecraft/structure/processor/CappedStructureProcessor
7 changes: 7 additions & 0 deletions mappings/net/minecraft/structure/processor/StructureProcessor.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ CLASS net/minecraft/unmapped/C_gzgrrbxb net/minecraft/structure/processor/Struct
ARG 5 absoluteBlockInfo
ARG 6 placementData
METHOD m_kzywwfie getType ()Lnet/minecraft/unmapped/C_uoehvsty;
METHOD m_zwkjrhjm process (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Ljava/util/List;Ljava/util/List;Lnet/minecraft/unmapped/C_mhhynxof;)Ljava/util/List;
ARG 1 worldAccess
ARG 2 pos
ARG 3 pivot
ARG 4 localBlockInfo
ARG 5 absoluteBlockInfo
ARG 6 placementData
6 changes: 6 additions & 0 deletions mappings/net/minecraft/unmapped/C_ctsfmifk.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/unmapped/C_ctsfmifk
FIELD f_yxgkwomu lootConditions [Lnet/minecraft/unmapped/C_vqkczpuv;
METHOD <init> ([Lnet/minecraft/unmapped/C_vqkczpuv;)V
ARG 1 lootConditions
METHOD m_bedcmskq ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_ctsfmifk;
ARG 0 lootConditions
2 changes: 2 additions & 0 deletions mappings/net/minecraft/unmapped/C_czisrdmd.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_czisrdmd
METHOD m_vfahppjl (ILnet/minecraft/unmapped/C_ghdnlrrw;)V
4 changes: 4 additions & 0 deletions mappings/net/minecraft/unmapped/C_smovfozc.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/unmapped/C_smovfozc
METHOD trigger (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;J)Z
ARG 2 entity
ARG 3 time
4 changes: 4 additions & 0 deletions mappings/net/minecraft/unmapped/C_xaygoojx.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/unmapped/C_xaygoojx
FIELD f_toqcjiql identifier Lnet/minecraft/unmapped/C_ncpywfca;
METHOD <init> ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 1 conditions
2 changes: 2 additions & 0 deletions mappings/net/minecraft/unmapped/C_yfpegcpm.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_yfpegcpm
FIELD f_hcebkdbk status Lnet/minecraft/unmapped/C_wbtjxfbq$C_sqbcjfsz;
4 changes: 4 additions & 0 deletions mappings/net/minecraft/util/math/Direction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
ARG 0 x
ARG 1 y
ARG 2 z
METHOD m_lepqatxf fromXYZ (III)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 x
ARG 1 y
ARG 2 z
METHOD m_lxrgvhbm getOffsetY ()I
METHOD m_nyqvqnqv transform (Lorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 position
Expand Down

1 comment on commit 3bf3f67

@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 3bf3f67, 13 file(s) were updated with 90 line(s) added and 80 removed compared to the latest Quilt Mappings version.

View the diff here: 
Only in namedSrc/net/minecraft/client/gui/widget: MultilineScrollableWidget.java
diff -bur namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.java namedSrc/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.java
--- namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.java	2023-07-07 00:17:09.850367454 +0000
+++ namedSrc/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.java	2023-07-07 00:15:24.872713886 +0000
@@ -10,6 +10,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.MultilineScrollableWidget;
 import net.minecraft.client.realms.RealmsClient;
 import net.minecraft.client.realms.dto.RealmsServer;
 import net.minecraft.client.realms.dto.Subscription;
@@ -17,7 +18,6 @@
 import net.minecraft.client.util.ChatNarratorManager;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qnehaoor;
 import net.minecraft.util.UrlConstants;
 import net.minecraft.util.Util;
 import org.jetbrains.annotations.Nullable;
@@ -71,9 +71,10 @@
     */
    private static final Text UNKNOWN_TEXT = Text.translatable("mco.configure.world.subscription.unknown");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ilaidvjv Lnet/minecraft/unmapped/C_zmyqzgre;f_ilaidvjv:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named RECURRING_SUBSCRIPTION_INFO Lnet/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen;RECURRING_SUBSCRIPTION_INFO:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_ilaidvjv = Text.translatable("mco.configure.world.subscription.recurring.info");
+   private static final Text RECURRING_SUBSCRIPTION_INFO = Text.translatable("mco.configure.world.subscription.recurring.info");
    /**
     * @mapping {@literal hashed f_irdxpwpl Lnet/minecraft/unmapped/C_zmyqzgre;f_irdxpwpl:Lnet/minecraft/unmapped/C_wrmtlwqx;}
     * @mapping {@literal named parent Lnet/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen;parent:Lnet/minecraft/client/gui/screen/Screen;}
@@ -135,7 +136,9 @@
             this.client.setScreen(new RealmsLongConfirmationScreen(this::onDeletionConfirmed, RealmsLongConfirmationScreen.Type.WARNING, lv, lv2, true));
          }).positionAndSize(this.width / 2 - 100, row(10), 200, 20).build());
       } else {
-         this.addDrawableChild(new C_qnehaoor(this.width / 2 - 100, row(8), 200, 46, f_ilaidvjv, this.textRenderer).m_jclajfmw(10526880));
+         this.addDrawableChild(
+            new MultilineScrollableWidget(this.width / 2 - 100, row(8), 200, 46, RECURRING_SUBSCRIPTION_INFO, this.textRenderer).withTextColor(10526880)
+         );
       }
 
       this.addDrawableChild(
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2023-07-07 00:17:09.914368411 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2023-07-07 00:15:24.944715048 +0000
@@ -221,9 +221,9 @@
     * @mapping {@literal hashed m_ftefeyzd Lnet/minecraft/unmapped/C_ghdnlrrw;m_ftefeyzd(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;I)V}
     * @mapping {@literal named m_ftefeyzd Lnet/minecraft/client/world/ClientWorld;m_ftefeyzd(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)V}
     */
-   public void m_ftefeyzd(BlockPos pos, BlockState state, int i) {
+   public void m_ftefeyzd(BlockPos pos, BlockState state, int flags) {
       if (!this.f_ycswtnpc.m_mmtdqsga(pos, state)) {
-         super.setBlockState(pos, state, i, 512);
+         super.setBlockState(pos, state, flags, 512);
       }
    }
 
Only in namedSrc/net/minecraft/entity/ai/brain: PrioritizedEntry.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/ScheduleRule.java namedSrc/net/minecraft/entity/ai/brain/ScheduleRule.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/ScheduleRule.java	2023-07-07 00:17:09.902368232 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/ScheduleRule.java	2023-07-07 00:15:24.936714919 +0000
@@ -6,7 +6,6 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap;
 import java.util.Collection;
 import java.util.List;
-import net.minecraft.unmapped.C_tpkdljtb;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_dozxwuad}
@@ -17,7 +16,7 @@
     * @mapping {@literal hashed f_cnpiahie Lnet/minecraft/unmapped/C_dozxwuad;f_cnpiahie:Ljava/util/List;}
     * @mapping {@literal named entries Lnet/minecraft/entity/ai/brain/ScheduleRule;entries:Ljava/util/List;}
     */
-   private final List<C_tpkdljtb> entries = Lists.<C_tpkdljtb>newArrayList();
+   private final List<PrioritizedEntry> entries = Lists.<PrioritizedEntry>newArrayList();
    /**
     * @mapping {@literal hashed f_wadeepst Lnet/minecraft/unmapped/C_dozxwuad;f_wadeepst:I}
     * @mapping {@literal named prioritizedEntryIndex Lnet/minecraft/entity/ai/brain/ScheduleRule;prioritizedEntryIndex:I}
@@ -28,7 +27,7 @@
     * @mapping {@literal hashed m_mjpstvza Lnet/minecraft/unmapped/C_dozxwuad;m_mjpstvza()Lcom/google/common/collect/ImmutableList;}
     * @mapping {@literal named getEntries Lnet/minecraft/entity/ai/brain/ScheduleRule;getEntries()Lcom/google/common/collect/ImmutableList;}
     */
-   public ImmutableList<C_tpkdljtb> getEntries() {
+   public ImmutableList<PrioritizedEntry> getEntries() {
       return ImmutableList.copyOf(this.entries);
    }
 
@@ -37,7 +36,7 @@
     * @mapping {@literal named add Lnet/minecraft/entity/ai/brain/ScheduleRule;add(IF)Lnet/minecraft/entity/ai/brain/ScheduleRule;}
     */
    public ScheduleRule add(int startTime, float priority) {
-      this.entries.add(new C_tpkdljtb(startTime, priority));
+      this.entries.add(new PrioritizedEntry(startTime, priority));
       this.sort();
       return this;
    }
@@ -46,7 +45,7 @@
     * @mapping {@literal hashed m_pdaaxjtb Lnet/minecraft/unmapped/C_dozxwuad;m_pdaaxjtb(Ljava/util/Collection;)Lnet/minecraft/unmapped/C_dozxwuad;}
     * @mapping {@literal named add Lnet/minecraft/entity/ai/brain/ScheduleRule;add(Ljava/util/Collection;)Lnet/minecraft/entity/ai/brain/ScheduleRule;}
     */
-   public ScheduleRule add(Collection<C_tpkdljtb> entries) {
+   public ScheduleRule add(Collection<PrioritizedEntry> entries) {
       this.entries.addAll(entries);
       this.sort();
       return this;
@@ -57,8 +56,8 @@
     * @mapping {@literal named sort Lnet/minecraft/entity/ai/brain/ScheduleRule;sort()V}
     */
    private void sort() {
-      Int2ObjectSortedMap<C_tpkdljtb> int2ObjectSortedMap = new Int2ObjectAVLTreeMap<>();
-      this.entries.forEach(arg -> int2ObjectSortedMap.put(arg.m_asttoyza(), arg));
+      Int2ObjectSortedMap<PrioritizedEntry> int2ObjectSortedMap = new Int2ObjectAVLTreeMap<>();
+      this.entries.forEach(arg -> int2ObjectSortedMap.put(arg.getStartTime(), arg));
       this.entries.clear();
       this.entries.addAll(int2ObjectSortedMap.values());
       this.prioritizedEntryIndex = 0;
@@ -72,20 +71,20 @@
       if (this.entries.size() <= 0) {
          return 0.0F;
       } else {
-         C_tpkdljtb lv = (C_tpkdljtb)this.entries.get(this.prioritizedEntryIndex);
-         C_tpkdljtb lv2 = (C_tpkdljtb)this.entries.get(this.entries.size() - 1);
-         boolean bl = time < lv.m_asttoyza();
+         PrioritizedEntry lv = (PrioritizedEntry)this.entries.get(this.prioritizedEntryIndex);
+         PrioritizedEntry lv2 = (PrioritizedEntry)this.entries.get(this.entries.size() - 1);
+         boolean bl = time < lv.getStartTime();
          int j = bl ? 0 : this.prioritizedEntryIndex;
-         float f = bl ? lv2.m_snmbvtrs() : lv.m_snmbvtrs();
+         float f = bl ? lv2.getPriority() : lv.getPriority();
 
          for (int k = j; k < this.entries.size(); ++k) {
-            C_tpkdljtb lv3 = (C_tpkdljtb)this.entries.get(k);
-            if (lv3.m_asttoyza() > time) {
+            PrioritizedEntry lv3 = (PrioritizedEntry)this.entries.get(k);
+            if (lv3.getStartTime() > time) {
                break;
             }
 
             this.prioritizedEntryIndex = k;
-            f = lv3.m_snmbvtrs();
+            f = lv3.getPriority();
          }
 
          return f;
diff -bur namedTargetSrc/net/minecraft/structure/OceanRuinGenerator.java namedSrc/net/minecraft/structure/OceanRuinGenerator.java
--- namedTargetSrc/net/minecraft/structure/OceanRuinGenerator.java	2023-07-07 00:17:09.862367633 +0000
+++ namedSrc/net/minecraft/structure/OceanRuinGenerator.java	2023-07-07 00:15:24.884714080 +0000
@@ -22,6 +22,7 @@
 import net.minecraft.structure.piece.StructurePiecesHolder;
 import net.minecraft.structure.processor.BlockIgnoreStructureProcessor;
 import net.minecraft.structure.processor.BlockRotStructureProcessor;
+import net.minecraft.structure.processor.CappedStructureProcessor;
 import net.minecraft.structure.processor.RuleStructureProcessor;
 import net.minecraft.structure.processor.StructureProcessor;
 import net.minecraft.structure.processor.StructureProcessorRule;
@@ -29,7 +30,6 @@
 import net.minecraft.structure.rule.AlwaysTrueRuleTest;
 import net.minecraft.structure.rule.BlockMatchRuleTest;
 import net.minecraft.structure.rule.block.entity.AppendLootRuleBlockEntityModifier;
-import net.minecraft.unmapped.C_irbfsoxo;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.Identifier;
@@ -161,7 +161,7 @@
     * Mapping not found
     */
    private static StructureProcessor m_hpmgyohf(Block arg, Block arg2, Identifier arg3) {
-      return new C_irbfsoxo(
+      return new CappedStructureProcessor(
          new RuleStructureProcessor(
             List.of(
                new StructureProcessorRule(
Only in namedSrc/net/minecraft/structure/processor: CappedStructureProcessor.java
diff -bur namedTargetSrc/net/minecraft/structure/processor/StructureProcessor.java namedSrc/net/minecraft/structure/processor/StructureProcessor.java
--- namedTargetSrc/net/minecraft/structure/processor/StructureProcessor.java	2023-07-07 00:17:09.978369369 +0000
+++ namedSrc/net/minecraft/structure/processor/StructureProcessor.java	2023-07-07 00:15:25.000715952 +0000
@@ -36,16 +36,17 @@
    protected abstract StructureProcessorType<?> getType();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zwkjrhjm Lnet/minecraft/unmapped/C_gzgrrbxb;m_zwkjrhjm(Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Ljava/util/List;Ljava/util/List;Lnet/minecraft/unmapped/C_mhhynxof;)Ljava/util/List;}
+    * @mapping {@literal named process Lnet/minecraft/structure/processor/StructureProcessor;process(Lnet/minecraft/world/ServerWorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Ljava/util/List;Ljava/util/List;Lnet/minecraft/structure/StructurePlacementData;)Ljava/util/List;}
     */
-   public List<Structure.StructureBlockInfo> m_zwkjrhjm(
-      ServerWorldAccess arg,
-      BlockPos arg2,
-      BlockPos arg3,
-      List<Structure.StructureBlockInfo> list,
-      List<Structure.StructureBlockInfo> list2,
-      StructurePlacementData arg4
+   public List<Structure.StructureBlockInfo> process(
+      ServerWorldAccess worldAccess,
+      BlockPos pos,
+      BlockPos pivot,
+      List<Structure.StructureBlockInfo> localBlockInfo,
+      List<Structure.StructureBlockInfo> absoluteBlockInfo,
+      StructurePlacementData placementData
    ) {
-      return list2;
+      return absoluteBlockInfo;
    }
 }
diff -bur namedTargetSrc/net/minecraft/structure/processor/StructureProcessorLists.java namedSrc/net/minecraft/structure/processor/StructureProcessorLists.java
--- namedTargetSrc/net/minecraft/structure/processor/StructureProcessorLists.java	2023-07-07 00:17:09.950368950 +0000
+++ namedSrc/net/minecraft/structure/processor/StructureProcessorLists.java	2023-07-07 00:15:24.980715629 +0000
@@ -19,7 +19,6 @@
 import net.minecraft.structure.rule.RandomBlockMatchRuleTest;
 import net.minecraft.structure.rule.TagMatchRuleTest;
 import net.minecraft.structure.rule.block.entity.AppendLootRuleBlockEntityModifier;
-import net.minecraft.unmapped.C_irbfsoxo;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.int_provider.ConstantIntProvider;
@@ -1058,8 +1057,8 @@
    /**
     * Mapping not found
     */
-   private static C_irbfsoxo m_vphbtmot(Identifier arg, int i) {
-      return new C_irbfsoxo(
+   private static CappedStructureProcessor m_vphbtmot(Identifier arg, int i) {
+      return new CappedStructureProcessor(
          new RuleStructureProcessor(
             List.of(
                new StructureProcessorRule(
diff -bur namedTargetSrc/net/minecraft/structure/processor/StructureProcessorType.java namedSrc/net/minecraft/structure/processor/StructureProcessorType.java
--- namedTargetSrc/net/minecraft/structure/processor/StructureProcessorType.java	2023-07-07 00:17:09.822367035 +0000
+++ namedSrc/net/minecraft/structure/processor/StructureProcessorType.java	2023-07-07 00:15:24.832713240 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_irbfsoxo;
 import net.minecraft.util.dynamic.RegistryElementCodec;
 
 /**
@@ -95,7 +94,7 @@
     * @mapping {@literal hashed f_asqnyoce Lnet/minecraft/unmapped/C_uoehvsty;f_asqnyoce:Lnet/minecraft/unmapped/C_uoehvsty;}
     * @mapping {@literal named CAPPED Lnet/minecraft/structure/processor/StructureProcessorType;CAPPED:Lnet/minecraft/structure/processor/StructureProcessorType;}
     */
-   StructureProcessorType<C_irbfsoxo> CAPPED = register("capped", C_irbfsoxo.CODEC);
+   StructureProcessorType<CappedStructureProcessor> CAPPED = register("capped", CappedStructureProcessor.CODEC);
 
    /**
     * @mapping {@literal hashed codec Lnet/minecraft/unmapped/C_uoehvsty;codec()Lcom/mojang/serialization/Codec;}
diff -bur namedTargetSrc/net/minecraft/structure/Structure.java namedSrc/net/minecraft/structure/Structure.java
--- namedTargetSrc/net/minecraft/structure/Structure.java	2023-07-07 00:17:09.886367992 +0000
+++ namedSrc/net/minecraft/structure/Structure.java	2023-07-07 00:15:24.916714596 +0000
@@ -483,7 +483,7 @@
     * @mapping {@literal named process Lnet/minecraft/structure/Structure;process(Lnet/minecraft/world/ServerWorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/structure/StructurePlacementData;Ljava/util/List;)Ljava/util/List;}
     */
    public static List<Structure.StructureBlockInfo> process(
-      ServerWorldAccess arg, BlockPos pos, BlockPos pivot, StructurePlacementData placementData, List<Structure.StructureBlockInfo> blockInfo
+      ServerWorldAccess worldAccess, BlockPos pos, BlockPos pivot, StructurePlacementData placementData, List<Structure.StructureBlockInfo> blockInfo
    ) {
       List<Structure.StructureBlockInfo> list2 = new ArrayList();
       List<Structure.StructureBlockInfo> list3 = new ArrayList();
@@ -494,7 +494,7 @@
          Iterator<StructureProcessor> iterator = placementData.getProcessors().iterator();
 
          while (lv3 != null && iterator.hasNext()) {
-            lv3 = ((StructureProcessor)iterator.next()).process(arg, pos, pivot, lv, lv3, placementData);
+            lv3 = ((StructureProcessor)iterator.next()).process(worldAccess, pos, pivot, lv, lv3, placementData);
          }
 
          if (lv3 != null) {
@@ -504,7 +504,7 @@
       }
 
       for (StructureProcessor lv4 : placementData.getProcessors()) {
-         list3 = lv4.m_zwkjrhjm(arg, pos, pivot, list2, list3, placementData);
+         list3 = lv4.process(worldAccess, pos, pivot, list2, list3, placementData);
       }
 
       return list3;
diff -bur namedTargetSrc/net/minecraft/unmapped/C_ctsfmifk.java namedSrc/net/minecraft/unmapped/C_ctsfmifk.java
--- namedTargetSrc/net/minecraft/unmapped/C_ctsfmifk.java	2023-07-07 00:17:09.938368770 +0000
+++ namedSrc/net/minecraft/unmapped/C_ctsfmifk.java	2023-07-07 00:15:24.968715435 +0000
@@ -13,7 +13,8 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Mapping not found
+ * @mapping {@literal hashed net/minecraft/unmapped/C_ctsfmifk}
+ * @mapping {@literal named net/minecraft/unmapped/C_ctsfmifk}
  */
 public class C_ctsfmifk {
    /**
@@ -21,27 +22,30 @@
     */
    public static final C_ctsfmifk f_twhokrnd = new C_ctsfmifk(new LootCondition[0]);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yxgkwomu Lnet/minecraft/unmapped/C_ctsfmifk;f_yxgkwomu:[Lnet/minecraft/unmapped/C_vqkczpuv;}
+    * @mapping {@literal named lootConditions Lnet/minecraft/unmapped/C_ctsfmifk;lootConditions:[Lnet/minecraft/loot/condition/LootCondition;}
     */
-   private final LootCondition[] f_yxgkwomu;
+   private final LootCondition[] lootConditions;
    /**
     * Mapping not found
     */
    private final Predicate<LootContext> f_rvptvckz;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ctsfmifk;<init>([Lnet/minecraft/unmapped/C_vqkczpuv;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_ctsfmifk;<init>([Lnet/minecraft/loot/condition/LootCondition;)V}
     */
-   C_ctsfmifk(LootCondition[] args) {
-      this.f_yxgkwomu = args;
-      this.f_rvptvckz = LootConditionTypes.joinAnd(args);
+   C_ctsfmifk(LootCondition[] lootConditions) {
+      this.lootConditions = lootConditions;
+      this.f_rvptvckz = LootConditionTypes.joinAnd(lootConditions);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bedcmskq Lnet/minecraft/unmapped/C_ctsfmifk;m_bedcmskq([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_ctsfmifk;}
+    * @mapping {@literal named m_bedcmskq Lnet/minecraft/unmapped/C_ctsfmifk;m_bedcmskq([Lnet/minecraft/loot/condition/LootCondition;)Lnet/minecraft/unmapped/C_ctsfmifk;}
     */
-   public static C_ctsfmifk m_bedcmskq(LootCondition... args) {
-      return new C_ctsfmifk(args);
+   public static C_ctsfmifk m_bedcmskq(LootCondition... lootConditions) {
+      return new C_ctsfmifk(lootConditions);
    }
 
    /**
@@ -68,7 +72,7 @@
     * Mapping not found
     */
    public JsonElement m_igcsxsyb(AdvancementEntityPredicateSerializer arg) {
-      return (JsonElement)(this.f_yxgkwomu.length == 0 ? JsonNull.INSTANCE : arg.conditionsToJson(this.f_yxgkwomu));
+      return (JsonElement)(this.lootConditions.length == 0 ? JsonNull.INSTANCE : arg.conditionsToJson(this.lootConditions));
    }
 
    /**
Only in namedTargetSrc/net/minecraft/unmapped: C_irbfsoxo.java
Only in namedTargetSrc/net/minecraft/unmapped: C_qnehaoor.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_smovfozc.java namedSrc/net/minecraft/unmapped/C_smovfozc.java
--- namedTargetSrc/net/minecraft/unmapped/C_smovfozc.java	2023-07-07 00:17:09.834367214 +0000
+++ namedSrc/net/minecraft/unmapped/C_smovfozc.java	2023-07-07 00:15:24.848713499 +0000
@@ -12,5 +12,5 @@
     * @mapping {@literal hashed trigger Lnet/minecraft/unmapped/C_smovfozc;trigger(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;J)Z}
     * @mapping {@literal named trigger Lnet/minecraft/unmapped/C_smovfozc;trigger(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;J)Z}
     */
-   boolean trigger(ServerWorld world, E arg2, long l);
+   boolean trigger(ServerWorld world, E entity, long time);
 }
Only in namedTargetSrc/net/minecraft/unmapped: C_tpkdljtb.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_xaygoojx.java namedSrc/net/minecraft/unmapped/C_xaygoojx.java
--- namedTargetSrc/net/minecraft/unmapped/C_xaygoojx.java	2023-07-07 00:17:09.890368052 +0000
+++ namedSrc/net/minecraft/unmapped/C_xaygoojx.java	2023-07-07 00:15:24.920714661 +0000
@@ -29,16 +29,18 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_toqcjiql Lnet/minecraft/unmapped/C_xaygoojx;f_toqcjiql:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named identifier Lnet/minecraft/unmapped/C_xaygoojx;identifier:Lnet/minecraft/util/Identifier;}
     */
-   final Identifier f_toqcjiql;
+   final Identifier identifier;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xaygoojx;<init>([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_ncpywfca;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_xaygoojx;<init>([Lnet/minecraft/loot/condition/LootCondition;Lnet/minecraft/util/Identifier;)V}
     */
-   C_xaygoojx(LootCondition[] args, Identifier arg) {
-      super(args);
-      this.f_toqcjiql = arg;
+   C_xaygoojx(LootCondition[] conditions, Identifier identifier) {
+      super(conditions);
+      this.identifier = identifier;
    }
 
    /**
@@ -54,16 +56,16 @@
     */
    @Override
    public void validate(LootTableReporter reporter) {
-      LootDataKey<LootFunction> lv = new LootDataKey<>(LootDataType.ITEM_MODIFIERS, this.f_toqcjiql);
+      LootDataKey<LootFunction> lv = new LootDataKey<>(LootDataType.ITEM_MODIFIERS, this.identifier);
       if (reporter.hasVisited(lv)) {
-         reporter.report("Function " + this.f_toqcjiql + " is recursively called");
+         reporter.report("Function " + this.identifier + " is recursively called");
       } else {
          super.validate(reporter);
          reporter.getDataLookup()
             .getElementOptional(lv)
             .ifPresentOrElse(
-               arg3 -> arg3.validate(reporter.makeChild(".{" + this.f_toqcjiql + "}", lv)),
-               () -> reporter.report("Unknown function table called " + this.f_toqcjiql)
+               arg3 -> arg3.validate(reporter.makeChild(".{" + this.identifier + "}", lv)),
+               () -> reporter.report("Unknown function table called " + this.identifier)
             );
       }
    }
@@ -73,9 +75,9 @@
     */
    @Override
    protected ItemStack process(ItemStack stack, LootContext context) {
-      LootFunction lv = context.getDataLookup().getElement(LootDataType.ITEM_MODIFIERS, this.f_toqcjiql);
+      LootFunction lv = context.getDataLookup().getElement(LootDataType.ITEM_MODIFIERS, this.identifier);
       if (lv == null) {
-         LOGGER.warn("Unknown function: {}", this.f_toqcjiql);
+         LOGGER.warn("Unknown function: {}", this.identifier);
          return stack;
       } else {
          LootContext.Entry<?> lv2 = LootContext.createEntry(lv);
@@ -112,7 +114,7 @@
        * @mapping {@literal named toJson Lnet/minecraft/unmapped/C_xaygoojx$C_qaktdnsh;toJson(Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_xaygoojx;Lcom/google/gson/JsonSerializationContext;)V}
        */
       public void toJson(JsonObject jsonObject, C_xaygoojx arg, JsonSerializationContext jsonSerializationContext) {
-         jsonObject.addProperty("name", arg.f_toqcjiql.toString());
+         jsonObject.addProperty("name", arg.identifier.toString());
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/unmapped/C_yfpegcpm.java namedSrc/net/minecraft/unmapped/C_yfpegcpm.java
--- namedTargetSrc/net/minecraft/unmapped/C_yfpegcpm.java	2023-07-07 00:17:09.830367154 +0000
+++ namedSrc/net/minecraft/unmapped/C_yfpegcpm.java	2023-07-07 00:15:24.844713434 +0000
@@ -6,20 +6,22 @@
 import net.minecraft.server.world.ServerWorld;
 
 /**
- * Mapping not found
+ * @mapping {@literal hashed net/minecraft/unmapped/C_yfpegcpm}
+ * @mapping {@literal named net/minecraft/unmapped/C_yfpegcpm}
  */
 public abstract class C_yfpegcpm<E extends LivingEntity> implements TaskControl<E>, C_smovfozc<E> {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hcebkdbk Lnet/minecraft/unmapped/C_yfpegcpm;f_hcebkdbk:Lnet/minecraft/unmapped/C_wbtjxfbq$C_sqbcjfsz;}
+    * @mapping {@literal named status Lnet/minecraft/unmapped/C_yfpegcpm;status:Lnet/minecraft/entity/ai/brain/task/Task$Status;}
     */
-   private Task.Status f_hcebkdbk = Task.Status.STOPPED;
+   private Task.Status status = Task.Status.STOPPED;
 
    /**
     * Mapping not found
     */
    @Override
    public final Task.Status getStatus() {
-      return this.f_hcebkdbk;
+      return this.status;
    }
 
    /**
@@ -28,7 +30,7 @@
    @Override
    public final boolean tryStart(ServerWorld world, E entity, long time) {
       if (this.trigger(world, entity, time)) {
-         this.f_hcebkdbk = Task.Status.RUNNING;
+         this.status = Task.Status.RUNNING;
          return true;
       } else {
          return false;
@@ -48,7 +50,7 @@
     */
    @Override
    public final void stop(ServerWorld world, E entity, long time) {
-      this.f_hcebkdbk = Task.Status.STOPPED;
+      this.status = Task.Status.STOPPED;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/util/math/Direction.java namedSrc/net/minecraft/util/math/Direction.java
--- namedTargetSrc/net/minecraft/util/math/Direction.java	2023-07-07 00:17:09.834367214 +0000
+++ namedSrc/net/minecraft/util/math/Direction.java	2023-07-07 00:15:24.844713434 +0000
@@ -449,28 +449,29 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lepqatxf Lnet/minecraft/unmapped/C_xpuuihxf;m_lepqatxf(III)Lnet/minecraft/unmapped/C_xpuuihxf;}
+    * @mapping {@literal named fromXYZ Lnet/minecraft/util/math/Direction;fromXYZ(III)Lnet/minecraft/util/math/Direction;}
     */
    @Nullable
-   public static Direction m_lepqatxf(int i, int j, int k) {
-      if (i == 0) {
-         if (j == 0) {
-            if (k > 0) {
+   public static Direction fromXYZ(int x, int y, int z) {
+      if (x == 0) {
+         if (y == 0) {
+            if (z > 0) {
                return SOUTH;
             }
 
-            if (k < 0) {
+            if (z < 0) {
                return NORTH;
             }
-         } else if (k == 0) {
-            if (j > 0) {
+         } else if (z == 0) {
+            if (y > 0) {
                return UP;
             }
 
             return DOWN;
          }
-      } else if (j == 0 && k == 0) {
-         if (i > 0) {
+      } else if (y == 0 && z == 0) {
+         if (x > 0) {
             return EAST;
          }

Please sign in to comment.