diff --git a/gradle.properties b/gradle.properties index f2dc62aea7..6f98a5a717 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.21.6+build.229 +enigma_version=0.22.0 stitch_version=0.5.1+build.77 diff --git a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping index 25fae9f753..e3650ca9a8 100644 --- a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping @@ -6,10 +6,10 @@ CLASS net/minecraft/class_624 net/minecraft/client/render/entity/model/WolfEntit FIELD field_27540 rightFrontLeg Lnet/minecraft/class_630; FIELD field_27541 leftFrontLeg Lnet/minecraft/class_630; FIELD field_3617 tail Lnet/minecraft/class_630; - COMMENT This is the main bone used to animate the tail. It contains {@link #real_tail} as one of its children. + COMMENT The main bone used to animate the tail. Contains {@link #realTail} as one of its children. FIELD field_3619 neck Lnet/minecraft/class_630; FIELD field_3621 head Lnet/minecraft/class_630; - COMMENT This is the main bone used to animate the head. It contains the {@link #real_head} as one of its children. + COMMENT The main bone used to animate the head. Contains {@link #realHead} as one of its children. FIELD field_3623 torso Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 3316681881..2e32860d5a 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -162,7 +162,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity COMMENT whether the held item is effective for that block, otherwise COMMENT it returns {@code true}. COMMENT - COMMENT @see Item#isSuitableFor + COMMENT @see net.minecraft.item.Item#isSuitableFor(BlockState) ARG 1 state METHOD method_7308 getShoulderEntityRight ()Lnet/minecraft/class_2487; METHOD method_7310 getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index f095520e38..f3a1340bfd 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_18672 foodComponent Lnet/minecraft/class_4174; FIELD field_21979 fireproof Z + FIELD field_27017 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID; FIELD field_8003 BLOCK_ITEMS Ljava/util/Map; FIELD field_8004 group Lnet/minecraft/class_1761; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 0df48d0c80..ff0d257962 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -151,7 +151,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT drops that would not be obtained when mining otherwise. COMMENT

COMMENT @return values consistent with calls to {@link Item#isSuitableFor} - COMMENT @see Item#isSuitableFor + COMMENT @see Item#isSuitableFor(BlockState) ARG 1 state METHOD method_7952 postMine (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 world diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping index 6a7b18b1c7..e695bb03c6 100644 --- a/mappings/net/minecraft/particle/ParticleType.mapping +++ b/mappings/net/minecraft/particle/ParticleType.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2396 net/minecraft/particle/ParticleType FIELD field_11197 parametersFactory Lnet/minecraft/class_2394$class_2395; METHOD (ZLnet/minecraft/class_2394$class_2395;)V ARG 1 alwaysShow - COMMENT whether this particle type should appear regardless of {@linkplain net.minecraft.client.options.GameOptions#particles particle mode} + COMMENT whether this particle type should appear regardless of {@linkplain net.minecraft.client.option.GameOptions#particles particle mode} ARG 2 parametersFactory METHOD method_10298 getParametersFactory ()Lnet/minecraft/class_2394$class_2395; METHOD method_10299 shouldAlwaysSpawn ()Z diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index 14b5e5d24f..128e5fa484 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -2,10 +2,10 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager COMMENT Provides resource loading capabilities to Minecraft. METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298; COMMENT Finds and returns the corresponding resource for a resource's identifier. - COMMENT
- COMMENT Starts by scanning each resource pack from highest priority to lowest. If no resource packs were found + COMMENT + COMMENT

Starts by scanning each resource pack from highest priority to lowest. If no resource packs were found COMMENT to contain the requested entry, will throw a {@code FileNotFoundException}. - COMMENT
+ COMMENT COMMENT @throws FileNotFoundException if the identified resource could not be found, or could not be loaded. COMMENT @throws IOException if the identified resource was found but a stream to it could not be opened. ARG 1 id @@ -14,11 +14,11 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager COMMENT Gets a set of all namespaces offered by the resource packs loaded by this manager. METHOD method_14488 findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; COMMENT Returns a sorted list of identifiers matching a path predicate. - COMMENT
- COMMENT Scanning begins in {@code startingPath} and each candidate file present under that directory + COMMENT + COMMENT

Scanning begins in {@code startingPath} and each candidate file present under that directory COMMENT will be offered up to the predicate to decide whether it should be included or not. - COMMENT
- COMMENT Elements in the returned list may not, necessarily be unique. Additional effort is advised to ensure that + COMMENT + COMMENT

Elements in the returned list may not, necessarily be unique. Additional effort is advised to ensure that COMMENT duplicates in the returned list are discarded before loading. COMMENT COMMENT @return the list matching identifiers @@ -28,18 +28,18 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager COMMENT a predicate to determine whether a path should be included or not METHOD method_14489 getAllResources (Lnet/minecraft/class_2960;)Ljava/util/List; COMMENT Gets all of the available resources to the corresponding resource identifier. - COMMENT
- COMMENT Resources are returned in load order, or ascending order of priority, so the last element in the returned + COMMENT + COMMENT

Resources are returned in load order, or ascending order of priority, so the last element in the returned COMMENT list is what would be returned normally by {@link #getResource} - COMMENT
+ COMMENT COMMENT @throws FileNotFoundException if no matching resources could be found (i.e. if the list would be empty) COMMENT @throws IOException if resources were found, but any one of them could not be opened to be read. ARG 1 id COMMENT the resource identifier to search for METHOD method_18234 containsResource (Lnet/minecraft/class_2960;)Z COMMENT Checks whether any of the currently-loaded resource packs contain an entry for the given id. - COMMENT
- COMMENT Starts by querying the resource pack with the highest priority to lowest until it finds one that + COMMENT + COMMENT

Starts by querying the resource pack with the highest priority to lowest until it finds one that COMMENT responds to the requested identifier. ARG 1 id COMMENT the resource identifier to search for