From 5f5bf931ea1ea3b007ed56bb8735cdb4ca1d5b6b Mon Sep 17 00:00:00 2001
From: enbrain <69905075+enbrain@users.noreply.github.com>
Date: Thu, 12 May 2022 03:27:43 +0900
Subject: [PATCH] Use American English for "travel" (#3144)
---
.../net/minecraft/entity/passive/TurtleEntity.mapping | 8 ++++----
mappings/net/minecraft/world/WorldEvents.mapping | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
index bc0d8cef21..d0596acf1c 100644
--- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
@@ -7,7 +7,7 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity
FIELD field_6922 TRAVEL_POS Lnet/minecraft/class_2940;
FIELD field_6923 DIGGING_SAND Lnet/minecraft/class_2940;
FIELD field_6924 LAND_BOUND Lnet/minecraft/class_2940;
- FIELD field_6925 ACTIVELY_TRAVELLING Lnet/minecraft/class_2940;
+ FIELD field_6925 ACTIVELY_TRAVELING Lnet/minecraft/class_2940;
METHOD method_20671 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
ARG 0 type
ARG 1 world
@@ -26,11 +26,11 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity
METHOD method_6687 getTravelPos ()Lnet/minecraft/class_2338;
METHOD method_6688 (Lnet/minecraft/class_1309;)Z
ARG 0 entity
- METHOD method_6691 isActivelyTravelling ()Z
+ METHOD method_6691 isActivelyTraveling ()Z
METHOD method_6693 getHomePos ()Lnet/minecraft/class_2338;
METHOD method_6695 isDiggingSand ()Z
- METHOD method_6696 setActivelyTravelling (Z)V
- ARG 1 travelling
+ METHOD method_6696 setActivelyTraveling (Z)V
+ ARG 1 traveling
METHOD method_6697 setLandBound (Z)V
ARG 1 landBound
METHOD method_6699 setTravelPos (Lnet/minecraft/class_2338;)V
diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping
index 7060d5cfb8..cb07740475 100644
--- a/mappings/net/minecraft/world/WorldEvents.mapping
+++ b/mappings/net/minecraft/world/WorldEvents.mapping
@@ -37,7 +37,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
COMMENT
Plays the anvil landing sound event.
COMMENT
Called by {@link net.minecraft.block.AnvilBlock#onLanding(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, net.minecraft.block.BlockState, net.minecraft.entity.FallingBlockEntity) AnvilBlock#onLanding}
FIELD field_31120 TRAVEL_THROUGH_PORTAL I
- COMMENT A portal is travelled through.
+ COMMENT A portal is traveled through.
COMMENT
Plays the portal travel sound event directly through the client's sound manager.
COMMENT
Called by {@link net.minecraft.server.network.ServerPlayerEntity#moveToWorld(net.minecraft.server.world.ServerWorld) ServerPlayerEntity#moveToWorld} FIELD field_31121 CHORUS_FLOWER_GROWS I