Fix typos and update enigma (FabricMC#2286)

* Fix typos and update enigma * forgot this typo * Update world_events.unpick
ErrorCraft · Apr 7, 2021 · 605d584 · 605d584
1 parent 2caa310
commit 605d584
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Setup and download and launch the latest version of [Enigma](https://github.com/
 Compared to launching Enigma externally, the gradle task adds a name guesser plugin that automatically map enums and a few constant field names.
 
 ### `yarnUnpicked`
-Same as above, but unpicks the constants and launches engima with them. Can be a little bit slower to get going.
+Same as above, but unpicks the constants and launches Enigma with them. Can be a little bit slower to get going.
 
 
 ### `build`

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-enigma_version=0.26.1
+enigma_version=0.27.0
 stitch_version=0.5.1+build.77
 unpick_version=2.2.0
 # Loader is only used by javadoc generation/linking

diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping
@@ -50,7 +50,7 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag
 			ARG 0 json
 		METHOD method_34891 addOptional (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
 			ARG 1 id
-			ARG 2 ource
+			ARG 2 source
 		METHOD method_34892 addOptionalTag (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
 			ARG 1 id
 			ARG 2 source

diff --git a/mappings/net/minecraft/test/AfterBatch.mapping b/mappings/net/minecraft/test/AfterBatch.mapping
@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_6300 net/minecraft/test/AfterBatch
-	COMMENT {@code AfterBatch} methods are ran once the batch specificied has finished.
+	COMMENT {@code AfterBatch} methods are ran once the batch specified has finished.
 	METHOD method_35930 batchId ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/test/BeforeBatch.mapping b/mappings/net/minecraft/test/BeforeBatch.mapping
@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_6301 net/minecraft/test/BeforeBatch
-	COMMENT {@code BeforeBatch} methods are ran before the batch specificied has started.
+	COMMENT {@code BeforeBatch} methods are ran before the batch specified has started.
 	METHOD method_35931 batchId ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping
@@ -24,8 +24,11 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
 	FIELD field_19023 status Lnet/minecraft/class_3765$class_4259;
 	FIELD field_19024 finishCooldown I
 	FIELD field_19172 preCalculatedRavagerSpawnLocation Ljava/util/Optional;
-	FIELD field_30683 OMNIOUS_BANNER_TRANSLATION_KEY Ljava/lang/String;
+	FIELD field_30670 MAX_DESPAWN_COUNTER I
+	FIELD field_30683 OMINOUS_BANNER_TRANSLATION_KEY Ljava/lang/String;
 	FIELD field_30684 RAIDERS_REMAINING_TRANSLATION_KEY Ljava/lang/String;
+	FIELD field_30686 DEFAULT_PRE_RAID_TICKS I
+	FIELD field_30689 MAX_ACTIVE_TICKS I
 	METHOD <init> (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
 		ARG 1 id
 		ARG 2 world

diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules
 		COMMENT <p>If this rule is set to {@code true} while raids are occurring, the raids will be stopped.
 	FIELD field_20638 DO_IMMEDIATE_RESPAWN Lnet/minecraft/class_1928$class_4313;
 		COMMENT A {@linkplain Rule game rule} which regulates whether a player should immediately respawn upon death.
+	FIELD field_30963 DEFAULT_RANDOM_TICK_SPEED I
 	FIELD field_9196 rules Ljava/util/Map;
 	FIELD field_9197 RULE_TYPES Ljava/util/Map;
 	METHOD <init> (Ljava/util/Map;)V

diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick
@@ -58,7 +58,7 @@ constant world_events net/minecraft/world/WorldEvents DISPENSER_ACTIVATED
 constant world_events net/minecraft/world/WorldEvents BLOCK_BROKEN
 constant world_events net/minecraft/world/WorldEvents SPLASH_POTION_SPLASHED
 constant world_events net/minecraft/world/WorldEvents EYE_OF_ENDER_BREAKS
-constant world_events net/minecraft/world/WorldEvents SPAWNER_FLAMES
+constant world_events net/minecraft/world/WorldEvents SPAWNER_SPAWNS_MOB
 constant world_events net/minecraft/world/WorldEvents PLANT_FERTILIZED
 constant world_events net/minecraft/world/WorldEvents DRAGON_BREATH_CLOUD_SPAWNS
 constant world_events net/minecraft/world/WorldEvents INSTANT_SPLASH_POTION_SPLASHED