Skip to content

Commit d3620d3

Browse files
committed
Fix code format caused by mapping migration
1 parent 3ef4e19 commit d3620d3

44 files changed

Lines changed: 138 additions & 140 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.cottonmc.cotton.gui;
22

3-
import net.minecraft.world.entity.player.Player;
43
import net.minecraft.world.Container;
4+
import net.minecraft.world.entity.player.Player;
55
import net.minecraft.world.item.ItemStack;
66

77
/**

src/main/java/io/github/cottonmc/cotton/gui/ItemSyncedGuiDescription.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.cottonmc.cotton.gui;
22

3-
import net.minecraft.world.entity.player.Player;
4-
import net.minecraft.world.entity.player.Inventory;
53
import net.minecraft.world.entity.SlotAccess;
6-
import net.minecraft.world.item.ItemStack;
4+
import net.minecraft.world.entity.player.Inventory;
5+
import net.minecraft.world.entity.player.Player;
76
import net.minecraft.world.inventory.MenuType;
7+
import net.minecraft.world.item.ItemStack;
88

99
import java.util.Objects;
1010

src/main/java/io/github/cottonmc/cotton/gui/SyncedGuiDescription.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
66
import net.fabricmc.fabric.api.networking.v1.PacketSender;
77
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
8-
import net.minecraft.world.level.block.Block;
9-
import net.minecraft.world.level.block.state.BlockState;
10-
import net.minecraft.world.WorldlyContainerHolder;
11-
import net.minecraft.world.level.block.entity.BlockEntity;
12-
import net.minecraft.world.entity.player.Player;
13-
import net.minecraft.world.entity.player.Inventory;
8+
import net.minecraft.server.level.ServerLevel;
9+
import net.minecraft.server.level.ServerPlayer;
1410
import net.minecraft.world.Container;
1511
import net.minecraft.world.SimpleContainer;
16-
import net.minecraft.world.item.ItemStack;
17-
import net.minecraft.world.inventory.SimpleContainerData;
18-
import net.minecraft.world.inventory.ContainerData;
12+
import net.minecraft.world.WorldlyContainerHolder;
13+
import net.minecraft.world.entity.player.Inventory;
14+
import net.minecraft.world.entity.player.Player;
1915
import net.minecraft.world.inventory.AbstractContainerMenu;
16+
import net.minecraft.world.inventory.ContainerData;
2017
import net.minecraft.world.inventory.ContainerLevelAccess;
2118
import net.minecraft.world.inventory.MenuType;
19+
import net.minecraft.world.inventory.SimpleContainerData;
2220
import net.minecraft.world.inventory.Slot;
23-
import net.minecraft.server.level.ServerPlayer;
24-
import net.minecraft.server.level.ServerLevel;
21+
import net.minecraft.world.item.ItemStack;
2522
import net.minecraft.world.level.Level;
23+
import net.minecraft.world.level.block.Block;
24+
import net.minecraft.world.level.block.entity.BlockEntity;
25+
import net.minecraft.world.level.block.state.BlockState;
2626

2727
import io.github.cottonmc.cotton.gui.client.BackgroundPainter;
2828
import io.github.cottonmc.cotton.gui.client.LibGui;

src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.cottonmc.cotton.gui;
22

3-
import net.minecraft.world.entity.player.Player;
43
import net.minecraft.world.Container;
5-
import net.minecraft.world.item.ItemStack;
4+
import net.minecraft.world.entity.player.Player;
65
import net.minecraft.world.inventory.Slot;
6+
import net.minecraft.world.item.ItemStack;
77

88
import com.google.common.collect.HashMultimap;
99
import com.google.common.collect.Multimap;

src/main/java/io/github/cottonmc/cotton/gui/client/BackgroundPainter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.cottonmc.cotton.gui.client;
22

3-
import net.minecraft.client.renderer.RenderPipelines;
43
import net.minecraft.client.gui.GuiGraphicsExtractor;
4+
import net.minecraft.client.renderer.RenderPipelines;
55
import net.minecraft.resources.Identifier;
66

77
import io.github.cottonmc.cotton.gui.impl.LibGuiCommon;

src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.github.cottonmc.cotton.gui.client;
22

3-
import net.minecraft.client.input.MouseButtonEvent;
43
import net.minecraft.client.gui.GuiGraphicsExtractor;
54
import net.minecraft.client.gui.components.events.GuiEventListener;
6-
import net.minecraft.client.gui.screens.Screen;
75
import net.minecraft.client.gui.narration.NarrationElementOutput;
6+
import net.minecraft.client.gui.screens.Screen;
87
import net.minecraft.client.input.CharacterEvent;
98
import net.minecraft.client.input.KeyEvent;
9+
import net.minecraft.client.input.MouseButtonEvent;
1010
import net.minecraft.client.input.PreeditEvent;
1111
import net.minecraft.network.chat.CommonComponents;
1212
import net.minecraft.network.chat.Component;

src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package io.github.cottonmc.cotton.gui.client;
22

33
import com.mojang.datafixers.util.Unit;
4-
import net.minecraft.client.input.MouseButtonEvent;
54
import net.minecraft.client.gui.GuiGraphicsExtractor;
65
import net.minecraft.client.gui.components.events.GuiEventListener;
7-
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
86
import net.minecraft.client.gui.narration.NarrationElementOutput;
7+
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
98
import net.minecraft.client.input.CharacterEvent;
109
import net.minecraft.client.input.KeyEvent;
10+
import net.minecraft.client.input.MouseButtonEvent;
1111
import net.minecraft.client.input.PreeditEvent;
12-
import net.minecraft.world.entity.player.Player;
13-
import net.minecraft.world.entity.player.Inventory;
1412
import net.minecraft.network.chat.CommonComponents;
1513
import net.minecraft.network.chat.Component;
14+
import net.minecraft.world.entity.player.Inventory;
15+
import net.minecraft.world.entity.player.Player;
1616

1717
import io.github.cottonmc.cotton.gui.GuiDescription;
1818
import io.github.cottonmc.cotton.gui.SyncedGuiDescription;

src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import net.minecraft.client.Minecraft;
44
import net.minecraft.client.gui.GuiGraphicsExtractor;
55
import net.minecraft.client.renderer.RenderPipelines;
6-
import net.minecraft.util.FormattedCharSequence;
76
import net.minecraft.network.chat.Style;
87
import net.minecraft.resources.Identifier;
8+
import net.minecraft.util.FormattedCharSequence;
99

1010
import io.github.cottonmc.cotton.gui.impl.mixin.client.GuiGraphicsExtractorAccessor;
1111
import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment;
1212
import io.github.cottonmc.cotton.gui.widget.data.Texture;
13-
import org.jspecify.annotations.Nullable;
1413
import org.joml.Matrix3x2fStack;
14+
import org.jspecify.annotations.Nullable;
1515

1616
/**
1717
* {@code ScreenDrawing} contains utility methods for drawing contents on a screen.

src/main/java/io/github/cottonmc/cotton/gui/client/WidgetHudElement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.github.cottonmc.cotton.gui.client;
22

3+
import com.mojang.blaze3d.platform.Window;
34
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
45
import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElement;
6+
import net.minecraft.client.DeltaTracker;
57
import net.minecraft.client.Minecraft;
68
import net.minecraft.client.gui.GuiGraphicsExtractor;
7-
import net.minecraft.client.DeltaTracker;
8-
import com.mojang.blaze3d.platform.Window;
99

1010
import io.github.cottonmc.cotton.gui.widget.WWidget;
1111
import org.jetbrains.annotations.ApiStatus;

src/main/java/io/github/cottonmc/cotton/gui/impl/ScreenNetworkingImpl.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,18 @@
1010
import net.fabricmc.fabric.api.event.EventFactory;
1111
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
1212
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
13-
import net.minecraft.network.protocol.common.custom.CustomPacketPayload.Type;
14-
import net.minecraft.world.entity.player.Player;
15-
import net.minecraft.nbt.Tag;
16-
import net.minecraft.nbt.NbtOps;
13+
import net.minecraft.core.RegistryAccess;
1714
import net.minecraft.nbt.NbtAccounter;
15+
import net.minecraft.nbt.NbtOps;
16+
import net.minecraft.nbt.Tag;
1817
import net.minecraft.network.RegistryFriendlyByteBuf;
19-
import net.minecraft.network.codec.StreamCodec;
2018
import net.minecraft.network.codec.ByteBufCodecs;
19+
import net.minecraft.network.codec.StreamCodec;
2120
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
22-
import net.minecraft.core.RegistryAccess;
21+
import net.minecraft.resources.Identifier;
2322
import net.minecraft.resources.RegistryOps;
23+
import net.minecraft.world.entity.player.Player;
2424
import net.minecraft.world.inventory.AbstractContainerMenu;
25-
import net.minecraft.resources.Identifier;
2625

2726
import io.github.cottonmc.cotton.gui.SyncedGuiDescription;
2827
import io.github.cottonmc.cotton.gui.networking.NetworkSide;

0 commit comments

Comments
 (0)