diff --git a/build.gradle b/build.gradle
index 8f685eb07..e12eea5c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,7 +108,7 @@ allprojects {
 
 	checkstyle {
 		configFile = rootProject.file("checkstyle.xml")
-		toolVersion = '8.25'
+		toolVersion = '8.31'
 	}
 }
 
diff --git a/checkstyle.xml b/checkstyle.xml
index 95451b1f9..179b92927 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -5,6 +5,7 @@
 	<property name="fileExtensions" value="java"/>
 	<property name="localeLanguage" value="en"/>
 	<property name="localeCountry" value="US"/>
+	<property name="tabWidth" value="4"/>
 
 	<module name="NewlineAtEndOfFile"/>
 
@@ -107,11 +108,11 @@
 		</module>
 
 		<module name="Indentation">
-			<property name="basicOffset" value="8"/>
+			<property name="basicOffset" value="4"/>
 			<property name="caseIndent" value="0"/>
-			<property name="throwsIndent" value="8"/>
-			<property name="arrayInitIndent" value="8"/>
-			<property name="lineWrappingIndentation" value="16"/>
+			<property name="throwsIndent" value="4"/>
+			<property name="arrayInitIndent" value="4"/>
+			<property name="lineWrappingIndentation" value="8"/>
 		</module>
 
 		<module name="ParenPad"/>
diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java b/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java
index e79543288..7aab92055 100644
--- a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java
+++ b/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java
@@ -26,9 +26,10 @@ import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 
 public interface ItemTooltipCallback {
-	/** Fired after the game has appended all base tooltip lines to the list. */
-	Event<ItemTooltipCallback> EVENT = EventFactory.createArrayBacked(ItemTooltipCallback.class, (listeners) ->
-			(stack, tooltipContext, lines) -> {
+	/**
+	 * Fired after the game has appended all base tooltip lines to the list.
+	 */
+	Event<ItemTooltipCallback> EVENT = EventFactory.createArrayBacked(ItemTooltipCallback.class, (listeners) -> (stack, tooltipContext, lines) -> {
 		for (ItemTooltipCallback callback : listeners) {
 			callback.getTooltip(stack, tooltipContext, lines);
 		}
@@ -37,6 +38,7 @@ public interface ItemTooltipCallback {
 	/**
 	 * Called when an item stack's tooltip is rendered. Text added to {@code lines} will be
 	 * rendered with the tooltip.
+	 *
 	 * @param lines the list containing the lines of text displayed on the stack's tooltip
 	 */
 	void getTooltip(ItemStack stack, TooltipContext tooltipContext, List<Text> lines);
diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java
index c4c3b1957..19176e950 100644
--- a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java
+++ b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java
@@ -94,13 +94,13 @@ public class ServerSidePacketRegistryImpl extends PacketRegistryImpl implements
 	@Override
 	protected void onRegister(Identifier id) {
 		createRegisterTypePacket(PacketTypes.REGISTER, Collections.singleton(id))
-			.ifPresent((packet) -> forEachHandler((n) -> n.sendPacket(packet)));
+				.ifPresent((packet) -> forEachHandler((n) -> n.sendPacket(packet)));
 	}
 
 	@Override
 	protected void onUnregister(Identifier id) {
 		createRegisterTypePacket(PacketTypes.UNREGISTER, Collections.singleton(id))
-			.ifPresent((packet) -> forEachHandler((n) -> n.sendPacket(packet)));
+				.ifPresent((packet) -> forEachHandler((n) -> n.sendPacket(packet)));
 	}
 
 	@Override
diff --git a/fabric-rendering-v1/src/main/java/net/fabricmc/fabric/api/client/rendering/v1/HudRenderCallback.java b/fabric-rendering-v1/src/main/java/net/fabricmc/fabric/api/client/rendering/v1/HudRenderCallback.java
index 1a5f7ab64..915f18af9 100644
--- a/fabric-rendering-v1/src/main/java/net/fabricmc/fabric/api/client/rendering/v1/HudRenderCallback.java
+++ b/fabric-rendering-v1/src/main/java/net/fabricmc/fabric/api/client/rendering/v1/HudRenderCallback.java
@@ -20,8 +20,7 @@ import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 
 public interface HudRenderCallback {
-	Event<HudRenderCallback> EVENT = EventFactory.createArrayBacked(HudRenderCallback.class, (listeners) ->
-			(delta) -> {
+	Event<HudRenderCallback> EVENT = EventFactory.createArrayBacked(HudRenderCallback.class, (listeners) -> (delta) -> {
 		for (HudRenderCallback event : listeners) {
 			event.onHudRender(delta);
 		}