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.

Sign up for GitHub

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

Jump to bottom

100% coverage of net.minecraft.data #515

Merged
merged 12 commits into from
Nov 17, 2023
Merged

100% coverage of net.minecraft.data #515

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
153da9b
start updating recipes
ix0rai Oct 20, 2023
6c5d470
Merge branch '23w42a' into 1.20.3/recipes
ix0rai Oct 21, 2023
df88960
work on recipes
ix0rai Oct 21, 2023
a077d73
Merge branch '23w43a' into 1.20.3/recipes
ix0rai Oct 27, 2023
f43775f
texture nonsense
ix0rai Oct 27, 2023
e0ae0c3
work
ix0rai Oct 31, 2023
1f8674b
progress
ix0rai Nov 4, 2023
7009f6c
100% baybee
ix0rai Nov 6, 2023
14916c9
fix spellcheck
ix0rai Nov 6, 2023
ce0bae1
address comments
ix0rai Nov 6, 2023
ddda380
address comments 2!
ix0rai Nov 6, 2023
d1c07d5
Merge branch '23w44a' into 1.20.3/data
ix0rai Nov 17, 2023
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
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/quilt/internal/tasks/lint/SpellingChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private static void checkMapping(Entry<?> entry, String name, ErrorReporter erro
String[] packageNames = name.substring(0, name.lastIndexOf(PACKAGE_SEPARATOR)).split(String.valueOf(PACKAGE_SEPARATOR));
for (String packageName : packageNames) {
String[] split = packageName.split("_");
namesToSplit.addAll(Set.of(split));
namesToSplit.addAll(List.of(split));
}
} else {
// handle underscores
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ gameplay
griefing
minceraft
minecraft
datapack
ix0rai marked this conversation as resolved.
Show resolved Hide resolved
modded
moj
mojang
Expand Down Expand Up @@ -419,6 +420,7 @@ collidable
compostable
craftable
dumpable
dustable
enchantable
equippable
loggable
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ guava = "31.1-jre"
jackson_xml = "2.14.1"
launchermeta_parser = "1.0.0"
enigma = "1.9.0"
enigma_plugin = "1.3.2"
enigma_plugin = "1.4.0"
tiny_remapper = "0.7.2"
stitch = "0.6.1"
unpick = "3.0.6"
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/advancement/criterion/Criterion.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
CLASS net/minecraft/unmapped/C_mysyaxfs net/minecraft/advancement/criterion/Criterion
METHOD m_eenzxdpn create (Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz;
ARG 1 conditions
METHOD m_ejusorzh conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_zkhebbek;
ARG 1 obj
ARG 2 predicateDeserializer
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/Crafter.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_dmnruvyr net/minecraft/block/Crafter
59 changes: 59 additions & 0 deletions mappings/net/minecraft/data/DataCache.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,64 @@
CLASS net/minecraft/unmapped/C_sdjwtmhs net/minecraft/data/DataCache
FIELD f_gnoxxssr LOGGER Lorg/slf4j/Logger;
FIELD f_jejdjrrn caches Ljava/util/Map;
FIELD f_jxwsfhus HEADER Ljava/lang/String;
FIELD f_mkwvlfbp totalSize I
FIELD f_mlfymuuy versionName Ljava/lang/String;
FIELD f_oramlaqo totalCacheMisses I
FIELD f_qwpafooa root Ljava/nio/file/Path;
FIELD f_rwicrgun paths Ljava/util/Set;
FIELD f_tfqmckwf cachePath Ljava/nio/file/Path;
FIELD f_ztlwkesb dataWriters Ljava/util/Set;
METHOD <init> (Ljava/nio/file/Path;Ljava/util/Collection;Lnet/minecraft/unmapped/C_xyxorzsk;)V
ARG 2 providerNames
ARG 3 version
METHOD m_agtpfcyr getPath (Ljava/lang/String;)Ljava/nio/file/Path;
ARG 1 providerName
METHOD m_lnghmvmn run (Ljava/lang/String;Lnet/minecraft/unmapped/C_sdjwtmhs$C_hkhplcrf;)Ljava/util/concurrent/CompletableFuture;
ARG 1 providerName
ARG 2 updater
METHOD m_raxfugkg applyUpdate (Lnet/minecraft/unmapped/C_sdjwtmhs$C_dleuahtm;)V
ARG 1 result
METHOD m_rwurkkna write ()V
METHOD m_seibnvlg hasVersionMismatch (Ljava/lang/String;)Z
ARG 1 providerName
METHOD m_varvkyie readCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb;
ARG 0 root
ARG 1 providerPath
CLASS C_brknvdua CachedDataWriter
FIELD f_auqbziix cacheMisses Ljava/util/concurrent/atomic/AtomicInteger;
FIELD f_fuqlgxhu oldCache Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb;
FIELD f_myhheiqf providerName Ljava/lang/String;
FIELD f_scfokgou closed Z
FIELD f_ydecndng newCache Lnet/minecraft/unmapped/C_sdjwtmhs$C_wqjscgeb;
METHOD <init> (Lnet/minecraft/unmapped/C_sdjwtmhs;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb;)V
ARG 2 providerName
ARG 3 version
METHOD m_otgwyuxc isInvalid (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)Z
ARG 1 path
ARG 2 hashCode
METHOD m_tvcboxdy finish ()Lnet/minecraft/unmapped/C_sdjwtmhs$C_dleuahtm;
CLASS C_dleuahtm UpdateResult
CLASS C_hkhplcrf CacheUpdater
METHOD update update (Lnet/minecraft/unmapped/C_temnquoh;)Ljava/util/concurrent/CompletableFuture;
ARG 1 writer
CLASS C_hysgzlgb ProviderCache
METHOD m_ekcmvbmk get (Ljava/nio/file/Path;)Lcom/google/common/hash/HashCode;
ARG 1 path
METHOD m_ezptbtio (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/nio/file/Path;Ljava/lang/String;)V
ARG 2 line
METHOD m_pziraizs write (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/lang/String;)V
ARG 1 root
ARG 2 providerPath
ARG 3 description
METHOD m_yhviwyuz readCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb;
ARG 0 root
ARG 1 providerPath
METHOD m_yrqjkfbo getSize ()I
CLASS C_wqjscgeb ProviderCacheBuilder
METHOD <init> (Ljava/lang/String;)V
ARG 1 version
METHOD m_mxhqozdg build ()Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb;
METHOD m_xlginnei put (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)V
ARG 1 path
ARG 2 hashCode
10 changes: 10 additions & 0 deletions mappings/net/minecraft/data/DataProvider.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,21 @@ CLASS net/minecraft/unmapped/C_nyiqvxcn net/minecraft/data/DataProvider
FIELD f_mkydivae FIXED_ORDER_FIELDS Ljava/util/function/ToIntFunction;
FIELD f_opmypmak LOGGER Lorg/slf4j/Logger;
FIELD f_rftlymvj JSON_KEY_SORTER Ljava/util/Comparator;
METHOD m_erzxphou writeToPath (Lnet/minecraft/unmapped/C_temnquoh;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;
ARG 0 writer
ARG 1 json
ARG 2 path
METHOD m_fafjrzdp getName ()Ljava/lang/String;
METHOD m_gpszpvej run (Lnet/minecraft/unmapped/C_temnquoh;)Ljava/util/concurrent/CompletableFuture;
ARG 1 writer
METHOD m_pgghgory (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V
ARG 0 map
METHOD m_wetvrfbf writeToPath (Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;
ARG 0 writer
ARG 2 object
ARG 3 path
METHOD m_wydopbbv (Ljava/lang/String;)Ljava/lang/String;
ARG 0 string
CLASS C_oersiawb Factory
METHOD create create (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_nyiqvxcn;
ARG 1 output
23 changes: 23 additions & 0 deletions mappings/net/minecraft/data/Main.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
CLASS net/minecraft/data/Main net/minecraft/data/Main
METHOD m_aswtcewy (Ljava/lang/String;)Ljava/nio/file/Path;
ARG 0 file
METHOD m_hcncdfng (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_pukwuixp;
ARG 0 output
METHOD m_ibkkeufr (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_rrnzlzth;
ARG 2 output
METHOD m_jzkkjpsw createFactory (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/unmapped/C_nyiqvxcn$C_oersiawb;
ARG 0 creator
ARG 1 lookupFuture
METHOD m_ldyuhhwg (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_nhqtnrtm;
ARG 2 output
METHOD m_nnflwwtx (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_pukwuixp;
ARG 0 output
METHOD m_qgeuxgqf (Ljava/util/Collection;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_eqresdzy;
ARG 1 output
METHOD m_rhhsytus (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_arcabcvu;
ARG 3 output
METHOD m_rszkkyyi create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZLnet/minecraft/unmapped/C_xyxorzsk;Z)Lnet/minecraft/unmapped/C_nditonqu;
ARG 0 output
ARG 1 inputs
Expand All @@ -9,5 +24,13 @@ CLASS net/minecraft/data/Main net/minecraft/data/Main
ARG 4 includeDev
ARG 5 includeReports
ARG 6 validate
ARG 7 version
ARG 8 ignoreCache
METHOD m_tddgfuuk (Ljava/util/Collection;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_mbkhigvd;
ARG 1 output
METHOD m_werkiqwz (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_nyiqvxcn;
ARG 2 output
METHOD m_xphvpsdq (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_pukwuixp;
ARG 0 output
METHOD main main ([Ljava/lang/String;)V
ARG 0 args
26 changes: 26 additions & 0 deletions mappings/net/minecraft/data/client/ItemModelGenerator.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,43 @@
CLASS net/minecraft/unmapped/C_cfvrpkog net/minecraft/data/client/ItemModelGenerator
FIELD f_ccmpywsi TRIM_MATERIALS Ljava/util/List;
FIELD f_siogckud writer Ljava/util/function/BiConsumer;
FIELD f_vdzuaouk TRIM_TYPE Lnet/minecraft/unmapped/C_ncpywfca;
METHOD <init> (Ljava/util/function/BiConsumer;)V
ARG 1 writer
METHOD m_bfdcsywm register (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_zppcsbsk;)V
ARG 1 item
ARG 2 model
METHOD m_bnmdefop uploadLayeredItem (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 1 id
ARG 2 layer0
ARG 3 layer1
ARG 4 layer2
METHOD m_chmkiimy registerCompass (Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 1 compass
METHOD m_kighpdfm register (Lnet/minecraft/unmapped/C_vorddnax;Ljava/lang/String;Lnet/minecraft/unmapped/C_zppcsbsk;)V
ARG 1 item
ARG 2 suffix
ARG 3 model
METHOD m_llpeiyoc createArmorJson (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;Lnet/minecraft/unmapped/C_fwzogbap;)Lcom/google/gson/JsonObject;
ARG 1 id
ARG 2 textures
ARG 3 material
METHOD m_mppeudhx registerArmor (Lnet/minecraft/unmapped/C_fxxorins;)V
ARG 1 armor
METHOD m_pmffjxfg registerClock (Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 1 clock
METHOD m_uirjkeyq uploadLayeredItem (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 1 id
ARG 2 layer0
ARG 3 layer1
METHOD m_vlmfwosx suffixTrim (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 id
ARG 2 materialName
METHOD m_ybnrnznt register (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_zppcsbsk;)V
ARG 1 item
ARG 2 texture
ARG 3 model
METHOD m_zkttuqam register ()V
CLASS C_cutcputf TrimModelData
METHOD m_wmqpuvqn getAppliedName (Lnet/minecraft/unmapped/C_fwzogbap;)Ljava/lang/String;
ARG 1 material
Loading