Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

complete some things, simple type names, misc #643

Merged
merged 21 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cf40d52
complete SharedConstants
supersaiyansubtlety Sep 22, 2024
82ceedd
complete n.m.village
supersaiyansubtlety Sep 22, 2024
31a647b
remove 'registryKey' from simple_type_field_names
supersaiyansubtlety Sep 22, 2024
8b28730
registry work
supersaiyansubtlety Sep 22, 2024
a88c6ec
complete n.m.registry.tag, more registry work
supersaiyansubtlety Sep 23, 2024
e5ce8c3
explicitly map CommandTreeUpdateS2CPacket consturctor param to work a…
supersaiyansubtlety Sep 24, 2024
3e107f0
complete n.m.registry
supersaiyansubtlety Sep 24, 2024
31f60c0
Add class comments to new simple type names
supersaiyansubtlety Sep 24, 2024
cd0714c
map ~97/270 RegsitryKeys affected by their removal from simple type n…
supersaiyansubtlety Sep 25, 2024
fe1096c
complete Items with the help of simple type names
supersaiyansubtlety Sep 25, 2024
bfce206
half way there! (through RegistryKeys affected by their removal from …
supersaiyansubtlety Sep 25, 2024
afe70fb
finished! fixing up RegistryKeys affected by their removal from simpl…
supersaiyansubtlety Sep 25, 2024
f09e955
fix typos
supersaiyansubtlety Sep 25, 2024
a1a050b
remove FindInvalidSimpleTypeFieldNamesTask stub for separate PR
supersaiyansubtlety Sep 25, 2024
8d5f91f
fixup a few things folling self-review
supersaiyansubtlety Sep 25, 2024
89139e6
make simple_type_field_names an input of insertAutoGeneratedMappings …
supersaiyansubtlety Sep 26, 2024
603d368
fix typo
supersaiyansubtlety Sep 30, 2024
400c73c
drop invalid mappings
supersaiyansubtlety Sep 30, 2024
993bc0f
re-complete ResourceKeyArgument
supersaiyansubtlety Sep 30, 2024
a3892d5
rename all GET_BY_ID -> BY_ID
supersaiyansubtlety Sep 30, 2024
ecaee57
Merge branch '24w39a' into procrastination
supersaiyansubtlety Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ dependencies {
}


import groovy.json.JsonSlurper
import org.objectweb.asm.ClassVisitor
import org.objectweb.asm.Opcodes
import org.quiltmc.draftsman.asm.visitor.DraftsmanAdapterClassVisitor
Expand All @@ -116,9 +117,16 @@ clean.doFirst {
tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar"

task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) {
final enigmaProfile = file("enigma_profile.json")

inputs.file(
new JsonSlurper().parse(enigmaProfile)
.services.jar_indexer.args.simple_type_field_names_path
)

Copy link
Member

Choose a reason for hiding this comment

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

This... Works for now. I would make an issue once this is merged to do this properly.

Copy link
Contributor Author

@supersaiyansubtlety supersaiyansubtlety Sep 26, 2024

Choose a reason for hiding this comment

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

afaict a proper fix would require enigma plugins to have a way of listing files they depend on, then enigma would list all files all plugins depend on
hadn't found getServiceProfiles

Is that what you mean?
Or something in qmap buildSrc?

Copy link
Member

Choose a reason for hiding this comment

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

something in the buildsrc

inputJar.set mappings.fileConstants.perVersionMappingsJar
inputMappings.set buildMappingsTiny.outputMappings
profile.set file("enigma_profile.json")
profile.set enigmaProfile
}

combineUnpickDefinitions {
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ unicode

// registry
memoize
memoized
unregister

// javadoc
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/SharedConstants.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_cpvbggkb RESOURCE_GENERATION_DEBUG_OVERRIDE Z
FIELD f_croffrlr ENABLE_WORLD_RECREATION_DEBUGGER Z
FIELD f_cwtltrpn ENABLE_GOAL_SELECTOR_DEBUGGER Z
FIELD f_czwrerlm DEBUG_EXPERIMENTAL_REDSTONE_WIRE_UPDATE_ORDER Z
FIELD f_daxksksq generateSquareTerrainWithoutNoise Z
FIELD f_dwxtvjnd DEBUG_FEATURE_COUNT Z
FIELD f_dzwzxzvb DISABLE_LIQUID_SPREADING Z
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/loot/LootTableReporter.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ CLASS net/minecraft/unmapped/C_eumtgsbp net/minecraft/loot/LootTableReporter
FIELD f_psnzcplo visitedElements Ljava/util/Set;
FIELD f_spdbzdri dataLookup Ljava/util/Optional;
FIELD f_tqavjmzz contextType Lnet/minecraft/unmapped/C_vczsvjil;
METHOD <init> (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_vczsvjil;Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;)V
ARG 3 dataLookup
METHOD m_cftbvarw getErrorReporter ()Lnet/minecraft/unmapped/C_jtpvewkp;
METHOD m_glhnmzie makeChild (Ljava/lang/String;)Lnet/minecraft/unmapped/C_eumtgsbp;
ARG 1 name
METHOD m_gqledvzt validateContext (Lnet/minecraft/unmapped/C_dogcxkxz;)V
ARG 1 contextAware
METHOD m_jwjmhnkf makeChild (Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_eumtgsbp;
ARG 1 name
METHOD m_qfxfbvfj hasVisited (Lnet/minecraft/unmapped/C_xhhleach;)Z
ARG 1 element
METHOD m_qktyesto withContextType (Lnet/minecraft/unmapped/C_vczsvjil;)Lnet/minecraft/unmapped/C_eumtgsbp;
ARG 1 contextType
METHOD m_rxfxlyoi getDataLookup ()Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;
METHOD m_tbxtkgvh report (Ljava/lang/String;)V
ARG 1 message
METHOD m_tsoypkps hasDataLookup ()Z
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ CLASS net/minecraft/unmapped/C_vzeoulff net/minecraft/network/packet/s2c/play/Co
FIELD f_mndqyfwo argumentType Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;
METHOD <init> (Lcom/mojang/brigadier/tree/ArgumentCommandNode;)V
ARG 1 commandNode
METHOD <init> (Ljava/lang/String;Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 3 suggestionId
METHOD m_bncjsviq getSuggestionId (Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 0 provider
METHOD m_mkgsnfyv write (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@ CLASS net/minecraft/unmapped/C_naseleda net/minecraft/predicate/DataComponentPre
ARG 1 componentMap
CLASS C_qvundqhp Builder
FIELD f_zqshleqs components Ljava/util/List;
METHOD m_jwpgiwvo add (Lnet/minecraft/unmapped/C_qkjwbfhx;)Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp;
ARG 1 component
METHOD m_paqnuexm add (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp;
ARG 1 type
ARG 2 value
METHOD m_uvpclufp build ()Lnet/minecraft/unmapped/C_naseleda;
1 change: 1 addition & 0 deletions mappings/net/minecraft/registry/BootstrapContext.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/unmapped/C_hqoyyfco net/minecraft/registry/BootstrapContext
METHOD m_cajjlsxn getRegistryLookup (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_pzdchrcy;
ARG 1 registry
METHOD m_pymxizhb register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
ARG 1 key
ARG 2 object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ CLASS net/minecraft/unmapped/C_wqxmvzdq net/minecraft/registry/DynamicRegistryMa
FIELD f_zgajrtqd EMPTY Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
METHOD m_lxobzcah fromRegistryOfRegistries (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
ARG 0 key
METHOD m_mkpozqht (Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 0 registry
METHOD m_sloxobqt freeze ()Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
METHOD m_vutgtdyk registries ()Ljava/util/stream/Stream;
METHOD m_vutgtdyk streamRegistries ()Ljava/util/stream/Stream;
CLASS C_fckcsnok
METHOD <init> (Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/stream/Stream;)V
ARG 2 entries
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/registry/DynamicRegistrySync.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@ CLASS net/minecraft/unmapped/C_uhbbwvga net/minecraft/registry/DynamicRegistrySy
ARG 4 registryConsumer
METHOD m_cakupvxg streamReloadableSyncedRegistries (Lnet/minecraft/unmapped/C_bcpxdrik;)Ljava/util/stream/Stream;
ARG 0 registryManager
METHOD m_cjpxffqt (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/util/Set;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V
ARG 5 holder
METHOD m_cttmreul (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;Ljava/lang/String;)Ljava/lang/IllegalArgumentException;
ARG 1 errorMessage
METHOD m_gnuhreao streamTaggableRegistries (Lnet/minecraft/unmapped/C_bcpxdrik;)Ljava/util/stream/Stream;
ARG 0 layeredRegistryManager
METHOD m_kfoqspmu (Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Z
ARG 0 registry
METHOD m_mtiqpvjp forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/Set;Ljava/util/function/BiConsumer;)V
ARG 2 knownPacks
ARG 3 registryConsumer
METHOD m_pacstrfb (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)V
ARG 4 data
METHOD m_vcpumcmq streamSyncedRegistries (Lnet/minecraft/unmapped/C_wqxmvzdq;)Ljava/util/stream/Stream;
METHOD m_wzlxyjqc isSynced (Lnet/minecraft/unmapped/C_xhhleach;)Z
ARG 0 registry
CLASS C_iikocaff SerializedRegistryEntry
3 changes: 3 additions & 0 deletions mappings/net/minecraft/registry/Holder.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CLASS net/minecraft/unmapped/C_cjzoxshv net/minecraft/registry/Holder
ARG 1 owner
METHOD m_uwpxznsu streamTags ()Ljava/util/stream/Stream;
METHOD m_ydnvjjng value ()Ljava/lang/Object;
METHOD m_ynppqgwx (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/String;
ARG 0 key
METHOD m_znglmuwb getKind ()Lnet/minecraft/unmapped/C_cjzoxshv$C_dflbytmp;
CLASS C_dflbytmp Kind
CLASS C_rjzpeyec Reference
Expand All @@ -35,6 +37,7 @@ CLASS net/minecraft/unmapped/C_cjzoxshv net/minecraft/registry/Holder
ARG 0 owner
ARG 1 value
METHOD m_fkurmhix setRegistryKey (Lnet/minecraft/unmapped/C_xhhleach;)V
METHOD m_loesexpf getTags ()Ljava/util/Set;
METHOD m_spfiiuqs create (Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
ARG 0 owner
ARG 1 registryKey
Expand Down
22 changes: 17 additions & 5 deletions mappings/net/minecraft/registry/HolderLookup.mapping
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
CLASS net/minecraft/unmapped/C_vtbxyypo net/minecraft/registry/HolderLookup
METHOD m_cjhuibvn holders ()Ljava/util/stream/Stream;
METHOD m_cjhuibvn streamHolders ()Ljava/util/stream/Stream;
METHOD m_pgmbmohw streamTagKeys ()Ljava/util/stream/Stream;
METHOD m_rpikeuoc streamTags ()Ljava/util/stream/Stream;
METHOD m_vtchccnr streamElementKeys ()Ljava/util/stream/Stream;
CLASS C_drwjtlvl RegistryLookup
METHOD m_cplftviu matchesPredicate (Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
METHOD m_cplftviu withFilter (Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
COMMENT @return a view of this lookup with entries filtered by the passed {@code predicate}
ARG 1 predicate
METHOD m_kqnidhqe enabledIn (Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
ARG 1 featureFlags
METHOD m_pjiyqhtq (Lnet/minecraft/unmapped/C_czxxrbcp;Ljava/lang/Object;)Z
ARG 1 gatedObject
METHOD m_vhaoljfo getRegistryLifecycle ()Lcom/mojang/serialization/Lifecycle;
METHOD m_wgqigdhk getKey ()Lnet/minecraft/unmapped/C_xhhleach;
CLASS C_jyxfuyee Delegate
METHOD m_smgukdep lookup ()Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
CLASS C_epoknvca
METHOD m_siwozrxd (Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z
ARG 1 holder
METHOD m_ysslswxl (Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z
ARG 1 holder
CLASS C_jyxfuyee Delegating
METHOD m_smgukdep getDelegate ()Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
CLASS C_etmlgbig Provider
METHOD m_dnidhibf create (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
ARG 0 lookups
METHOD m_pbceiquw streamRegistryKeys ()Ljava/util/stream/Stream;
METHOD m_hlpdjttt getLifecycle ()Lcom/mojang/serialization/Lifecycle;
COMMENT @return the {@link com.mojang.serialization.Lifecycle lifecycle} for this provider,
COMMENT determined by the least-stable lifecycle amongst its {@link #streamLookups lookups}
METHOD m_pbceiquw streamLookups ()Ljava/util/stream/Stream;
METHOD m_uwaazyzq createSerializationContext (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/unmapped/C_piadqmzm;
METHOD m_vwprjgpp streamRegistryKeys ()Ljava/util/stream/Stream;
METHOD m_wwvmnchf (Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
ARG 0 lookup
4 changes: 2 additions & 2 deletions mappings/net/minecraft/registry/HolderSet.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_odfnijdo net/minecraft/registry/HolderSet
ARG 0 contents
METHOD m_dneqvpzw ownedBy (Lnet/minecraft/unmapped/C_hkebgttw;)Z
ARG 1 owner
METHOD m_ebrshnnp isBound ()Z
METHOD m_fewclxfb getTag ()Ljava/util/Optional;
METHOD m_fzxplshe direct (Ljava/util/function/Function;Ljava/util/Collection;)Lnet/minecraft/unmapped/C_odfnijdo$C_zmwjwbow;
ARG 0 mapper
Expand Down Expand Up @@ -35,11 +36,10 @@ CLASS net/minecraft/unmapped/C_odfnijdo net/minecraft/registry/HolderSet
ARG 1 owner
ARG 2 key
METHOD m_lvlpmfrg getKey ()Lnet/minecraft/unmapped/C_ednuhnnn;
METHOD m_zaedbqzo setContents (Ljava/util/List;)V
METHOD m_zaedbqzo bindTo (Ljava/util/List;)V
ARG 1 contents
CLASS C_zmwjwbow DirectSet
FIELD f_sggtnbos contents Ljava/util/List;
FIELD f_wamwqcjf contentsSet Ljava/util/Set;
FIELD f_zqgrcisv EMPTY Lnet/minecraft/unmapped/C_odfnijdo$C_zmwjwbow;
METHOD <init> (Ljava/util/List;)V
ARG 1 contents
2 changes: 2 additions & 0 deletions mappings/net/minecraft/registry/MutableRegistry.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
CLASS net/minecraft/unmapped/C_eexxncvi net/minecraft/registry/MutableRegistry
METHOD m_eneptwjq bindTag (Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/List;)V
ARG 2 contents
METHOD m_uapzeinx empty ()Z
METHOD m_ulbocxwk getHolderProvider ()Lnet/minecraft/unmapped/C_pzdchrcy;
METHOD m_yomgwjob register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;Lnet/minecraft/unmapped/C_jhxfjegj;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
Expand Down
12 changes: 11 additions & 1 deletion mappings/net/minecraft/registry/Registries.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,26 @@ CLASS net/minecraft/unmapped/C_nusqeapl net/minecraft/registry/Registries
FIELD f_zjshyqas DENSITY_FUNCTION Lnet/minecraft/unmapped/C_tqxyjqsk;
FIELD f_zrzntavz BLOCK_ENTITY_TYPE Lnet/minecraft/unmapped/C_tqxyjqsk;
FIELD f_zydiinmc TRUNK_PLACER_TYPE Lnet/minecraft/unmapped/C_tqxyjqsk;
METHOD m_eabwmwqn bindTagsToEmpty (Lnet/minecraft/unmapped/C_tqxyjqsk;)V
METHOD m_fgyhnhhd freeze ()V
METHOD m_grgbvblx createDefaultMappedUnfrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_zogerkic;
ARG 0 key
METHOD m_gwxfieow createSimpleUnfrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_tqxyjqsk;
ARG 0 key
METHOD m_hhgwdqyg internalRegister (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_eexxncvi;
ARG 1 entry
ARG 2 bootstrap
METHOD m_lzhvsneq createDefaultMappedFrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_zogerkic;
ARG 0 key
METHOD m_mwsegmux bootstrap ()V
METHOD m_ouwxdits (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/function/Supplier;)V
ARG 1 bootstrapper
METHOD m_sgrkhfqj validate (Lnet/minecraft/unmapped/C_tqxyjqsk;)V
ARG 0 registries
ARG 0 root
METHOD m_uavjgjwm getHolderProvider (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_pzdchrcy;
METHOD m_ujzdknrq (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_tqxyjqsk;)V
ARG 1 registry
METHOD m_ybecmlwo createContents ()V
METHOD m_ydemdayj createSimpleFrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_tqxyjqsk;
ARG 0 key
CLASS C_qpkaxgeh RegistryBootstrap
34 changes: 31 additions & 3 deletions mappings/net/minecraft/registry/Registry.mapping
Original file line number Diff line number Diff line change
@@ -1,32 +1,49 @@
CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry
METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
ARG 1 dynamicOps
METHOD m_aeqgxwbv (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 1 value
METHOD m_auupvvtk getOrThrow (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object;
ARG 1 key
METHOD m_blmrlzel (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 0 reference
METHOD m_bpoptgww wrapAsHolder (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 1 entry
METHOD m_cjwbheqc getKey (Ljava/lang/Object;)Ljava/util/Optional;
ARG 1 entry
METHOD m_ckzkjowv getKeys ()Ljava/util/Set;
METHOD m_dixnzblu createIntrusiveHolder (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
ARG 1 holder
ARG 1 entry
METHOD m_fiunuwfp freeze ()Lnet/minecraft/unmapped/C_tqxyjqsk;
METHOD m_hnixtpdg find (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional;
METHOD m_ifyosden get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object;
ARG 1 entryKey
METHOD m_ikxlhrge getOrEmpty (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
ARG 1 key
METHOD m_iotvxcay find (I)Ljava/util/Optional;
ARG 1 rawId
METHOD m_jktnfzok registerHolder (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
ARG 0 registry
ARG 1 id
ARG 2 entry
METHOD m_keyttxmd getTagOrEmpty (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/lang/Iterable;
ARG 1 tag
METHOD m_ksueyykv getReferenceHolderWithLifecycle ()Lcom/mojang/serialization/Codec;
METHOD m_kxeijgiq get (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/lang/Object;
METHOD m_leajtcub stream ()Ljava/util/stream/Stream;
METHOD m_ltdpyfam (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lcom/mojang/serialization/Lifecycle;
ARG 1 reference
METHOD m_nlhggctm getRegistrationInfo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
ARG 1 key
METHOD m_nqhcjajy register (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Object;)Ljava/lang/Object;
ARG 0 registry
ARG 1 id
ARG 2 entry
METHOD m_nqoydeav getEntries ()Ljava/util/Set;
METHOD m_nzuihlla getRandomElement (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_rlomrsco;)Ljava/util/Optional;
METHOD m_pquqhkot holderByNameCodec ()Lcom/mojang/serialization/Codec;
METHOD m_prsibeni startTagReload (Lnet/minecraft/unmapped/C_loluvnda$C_shtfmyxy;)Lnet/minecraft/unmapped/C_tqxyjqsk$C_dbbudibo;
ARG 1 registryTags
METHOD m_pvyfqcdo getCodec ()Lcom/mojang/serialization/Codec;
METHOD m_qeyctvgm asHolderIdMap ()Lnet/minecraft/unmapped/C_feaetnaz;
METHOD m_qkhirdbw validateReference (Lnet/minecraft/unmapped/C_cjzoxshv;)Lcom/mojang/serialization/DataResult;
Expand All @@ -43,15 +60,26 @@ CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry
ARG 2 entry
METHOD m_vnyaisgo getOrEmpty (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional;
ARG 1 id
METHOD m_vongjcbr getAny ()Ljava/util/Optional;
METHOD m_vongjcbr findAny ()Ljava/util/Optional;
METHOD m_vqpjfuha getId (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 entry
METHOD m_wicxsqqn getTags ()Ljava/util/stream/Stream;
METHOD m_vzcxipcd (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 0 reference
METHOD m_wicxsqqn streamBoundTags ()Ljava/util/stream/Stream;
METHOD m_wvmzcded registryHolder (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
ARG 0 registry
ARG 1 key
ARG 2 entry
METHOD m_wvztvxeq (Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)Ljava/util/Optional;
ARG 1 values
METHOD m_xyrkdyzg register (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
ARG 0 registry
ARG 1 id
ARG 2 entry
CLASS C_civshlgy
METHOD m_timkjzrb (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 0 holder
CLASS C_dbbudibo PendingTags
METHOD m_lucdhycj bind ()V
METHOD m_pipptaec getLookup ()Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
METHOD m_spczqdtt getKey ()Lnet/minecraft/unmapped/C_xhhleach;
8 changes: 7 additions & 1 deletion mappings/net/minecraft/registry/RegistryCloner.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
CLASS net/minecraft/unmapped/C_nlcdnclu net/minecraft/registry/RegistryCloner
METHOD m_qklykybk (Ljava/lang/String;)Ljava/lang/IllegalStateException;
ARG 0 errorMessage
METHOD m_qycjgtcz (Ljava/lang/String;)Ljava/lang/IllegalStateException;
ARG 0 errorMessage
METHOD m_zduexkww clone (Ljava/lang/Object;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/lang/Object;
ARG 1 value
ARG 2 subsetLookupProvider
ARG 3 fullLookupProvider
CLASS C_bxhpbcyq CloneableRegistries
FIELD f_naqxvgob registries Ljava/util/Map;
FIELD f_naqxvgob cloners Ljava/util/Map;
METHOD m_dtbyqapc with (Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_nlcdnclu$C_bxhpbcyq;
ARG 1 registry
METHOD m_lmwgprcv get (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_nlcdnclu;
ARG 1 registry
5 changes: 3 additions & 2 deletions mappings/net/minecraft/registry/RegistryKey.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey
METHOD m_achtcauh (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 1 value
METHOD m_acppaety registryKey ()Lnet/minecraft/unmapped/C_xhhleach;
METHOD m_bbzwrvpr packetCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;
METHOD m_bbzwrvpr createPacketCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;
ARG 0 key
METHOD m_fvrtwzrl of (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach;
COMMENT Creates a registry key for a value in a registry with a registry key for
COMMENT the value-holding registry in the root registry and an identifier of the
Expand All @@ -37,7 +38,7 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey
COMMENT Returns whether this registry key belongs to the given registry (according to its type, not whether the registry actually contains this key).
ARG 1 registry
COMMENT the key of the registry that this registry key should be inside
METHOD m_omukrpmi codec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec;
METHOD m_omukrpmi createCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec;
ARG 0 key
METHOD m_puwkoaeq ofRegistry (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach;
COMMENT Creates a registry key for a registry in the root registry (registry of
Expand Down
Loading
Loading