Reformat

origins/src/main/java/io/github/dueris/originspaper/access/BlockStateOwner.java

@@ -1,9 +1,9 @@
 package io.github.dueris.originspaper.access;
 
-import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.block.state.BlockState;
 
 public interface BlockStateOwner {
 	void apoli$setBlockState(BlockState state);
+
 	BlockState apoli$getBlockState();
 }

origins/src/main/java/io/github/dueris/originspaper/access/SectionBlocksOwner.java

@@ -5,8 +5,10 @@
 
 public interface SectionBlocksOwner {
 	void apoli$setBlockStates(BlockState[] states);
+
 	BlockState[] apoli$getBlockStates();
 
 	SectionPos apoli$sectionPos();
+
 	short[] apoli$positions();
 }

origins/src/main/java/io/github/dueris/originspaper/action/type/bientity/AddVelocityBiEntityActionType.java

@@ -87,7 +87,6 @@ protected void execute(Entity actor, Entity target) {
 	public enum Reference implements BiFunction<Entity, Entity, Vec3> {
 
 		POSITION {
-
 			@Override
 			public Vec3 apply(Entity actor, Entity target) {
 				return target.position().subtract(actor.position());
@@ -96,7 +95,6 @@ public Vec3 apply(Entity actor, Entity target) {
 		},
 
 		ROTATION {
-
 			@Override
 			public Vec3 apply(Entity actor, Entity target) {
 
@@ -107,7 +105,7 @@ public Vec3 apply(Entity actor, Entity target) {
 
 				float j = -Mth.sin(yaw * i) * Mth.cos(pitch * i);
 				float k = -Mth.sin(pitch * i);
-				float l =  Mth.cos(yaw * i) * Mth.cos(pitch * i);
+				float l = Mth.cos(yaw * i) * Mth.cos(pitch * i);
 
 				return new Vec3(j, k, l);
 

origins/src/main/java/io/github/dueris/originspaper/action/type/entity/GrantAdvancementEntityActionType.java

@@ -1,14 +1,14 @@
 package io.github.dueris.originspaper.action.type.entity;
 
+import io.github.dueris.calio.data.SerializableData;
+import io.github.dueris.calio.data.SerializableDataTypes;
 import io.github.dueris.originspaper.OriginsPaper;
 import io.github.dueris.originspaper.action.ActionConfiguration;
 import io.github.dueris.originspaper.action.type.EntityActionType;
 import io.github.dueris.originspaper.action.type.EntityActionTypes;
 import io.github.dueris.originspaper.data.ApoliDataTypes;
 import io.github.dueris.originspaper.data.TypedDataObjectFactory;
 import io.github.dueris.originspaper.util.AdvancementUtil;
-import io.github.dueris.calio.data.SerializableData;
-import io.github.dueris.calio.data.SerializableDataTypes;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.resources.ResourceLocation;

origins/src/main/java/io/github/dueris/originspaper/action/type/entity/ModifyDeathTicksEntityActionType.java

@@ -1,11 +1,11 @@
 package io.github.dueris.originspaper.action.type.entity;
 
+import io.github.dueris.calio.data.SerializableData;
 import io.github.dueris.originspaper.action.ActionConfiguration;
 import io.github.dueris.originspaper.action.type.EntityActionType;
 import io.github.dueris.originspaper.action.type.EntityActionTypes;
 import io.github.dueris.originspaper.data.TypedDataObjectFactory;
 import io.github.dueris.originspaper.util.modifier.Modifier;
-import io.github.dueris.calio.data.SerializableData;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import org.jetbrains.annotations.NotNull;

origins/src/main/java/io/github/dueris/originspaper/action/type/entity/SetFallDistanceEntityActionType.java

@@ -1,11 +1,11 @@
 package io.github.dueris.originspaper.action.type.entity;
 
+import io.github.dueris.calio.data.SerializableData;
+import io.github.dueris.calio.data.SerializableDataTypes;
 import io.github.dueris.originspaper.action.ActionConfiguration;
 import io.github.dueris.originspaper.action.type.EntityActionType;
 import io.github.dueris.originspaper.action.type.EntityActionTypes;
 import io.github.dueris.originspaper.data.TypedDataObjectFactory;
-import io.github.dueris.calio.data.SerializableData;
-import io.github.dueris.calio.data.SerializableDataTypes;
 import net.minecraft.world.entity.Entity;
 import org.jetbrains.annotations.NotNull;
 

origins/src/main/java/io/github/dueris/originspaper/action/type/entity/TriggerCooldownEntityActionType.java

@@ -1,13 +1,13 @@
 package io.github.dueris.originspaper.action.type.entity;
 
+import io.github.dueris.calio.data.SerializableData;
 import io.github.dueris.originspaper.action.ActionConfiguration;
 import io.github.dueris.originspaper.action.type.EntityActionType;
 import io.github.dueris.originspaper.action.type.EntityActionTypes;
 import io.github.dueris.originspaper.data.ApoliDataTypes;
 import io.github.dueris.originspaper.data.TypedDataObjectFactory;
 import io.github.dueris.originspaper.power.PowerReference;
 import io.github.dueris.originspaper.power.type.CooldownPowerType;
-import io.github.dueris.calio.data.SerializableData;
 import net.minecraft.world.entity.Entity;
 import org.jetbrains.annotations.NotNull;
 

origins/src/main/java/io/github/dueris/originspaper/client/MinecraftClient.java

@@ -3,7 +3,6 @@
 import io.github.dueris.originspaper.client.render.ClientHudRenderer;
 import io.github.dueris.originspaper.client.render.EntityRenderer;
 import io.github.dueris.originspaper.client.texture.TexturesImpl;
-import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import net.minecraft.server.level.ServerPlayer;
 
 import java.util.concurrent.ConcurrentHashMap;

origins/src/main/java/io/github/dueris/originspaper/client/texture/TexturesImpl.java

@@ -1,7 +1,6 @@
 package io.github.dueris.originspaper.client.texture;
 
 import io.github.dueris.originspaper.OriginsPaper;
-import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Tuple;
 

origins/src/main/java/io/github/dueris/originspaper/command/ResourceCommand.java

@@ -24,8 +24,6 @@
 import net.minecraft.world.scores.ScoreHolder;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Optional;
-
 import static io.papermc.paper.command.brigadier.Commands.argument;
 import static io.papermc.paper.command.brigadier.Commands.literal;
 

origins/src/main/java/io/github/dueris/originspaper/component/PowerHolderComponentImpl.java

@@ -38,6 +38,17 @@ public PowerHolderComponentImpl(LivingEntity owner) {
 		this.owner = owner;
 	}
 
+	private static PowerType shallowCopy(@NotNull PowerType powerType) {
+
+		//noinspection unchecked
+		PowerConfiguration<PowerType> config = (PowerConfiguration<PowerType>) powerType.getConfig();
+		TypedDataObjectFactory<PowerType> dataFactory = config.dataFactory();
+
+		SerializableData.Instance data = dataFactory.toData(powerType);
+		return dataFactory.fromData(data);
+
+	}
+
 	@Override
 	public boolean hasPower(Power power) {
 		return powers.containsKey(power);
@@ -281,17 +292,6 @@ public void writeToNbt(@NotNull CompoundTag compoundTag, HolderLookup.Provider l
 
 	}
 
-	private static PowerType shallowCopy(@NotNull PowerType powerType) {
-
-		//noinspection unchecked
-		PowerConfiguration<PowerType> config = (PowerConfiguration<PowerType>) powerType.getConfig();
-		TypedDataObjectFactory<PowerType> dataFactory = config.dataFactory();
-
-		SerializableData.Instance data = dataFactory.toData(powerType);
-		return dataFactory.fromData(data);
-
-	}
-
 	@Override
 	public void sync() {
 		// nope

origins/src/main/java/io/github/dueris/originspaper/condition/type/block/meta/OffsetBlockConditionType.java

@@ -14,7 +14,6 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;

origins/src/main/java/io/github/dueris/originspaper/data/ApoliDataTypes.java

@@ -37,7 +37,6 @@
 import net.minecraft.world.item.crafting.CraftingRecipe;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.GameType;
-import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Vector3f;
 
@@ -228,10 +227,38 @@ public <T> DataResult<T> encode(Component input, DynamicOps<T> ops, T prefix) {
 
 	public static final SerializableDataType<Pose> ENTITY_POSE = SerializableDataType.enumValue(Pose.class);
 	public static final SerializableDataType<Float> NORMALIZED_FLOAT = SerializableDataType.boundNumber(SerializableDataTypes.FLOAT, 0F, 1F);
+	public static final SerializableDataType<Vec3i> VECTOR_3_INT = SerializableDataType.compound(
+		new SerializableData()
+			.add("x", SerializableDataTypes.INT, 0)
+			.add("y", SerializableDataTypes.INT, 0)
+			.add("z", SerializableDataTypes.INT, 0),
+		data -> new Vec3i(
+			data.get("x"),
+			data.get("y"),
+			data.get("z")
+		),
+		(vec3i, serializableData) -> serializableData.instance()
+			.set("x", vec3i.getX())
+			.set("y", vec3i.getY())
+			.set("z", vec3i.getZ())
+	);
+	public static final SerializableDataType<Vector3f> VECTOR_3_FLOAT = SerializableDataType.compound(
+		new SerializableData()
+			.add("x", SerializableDataTypes.FLOAT, 0F)
+			.add("y", SerializableDataTypes.FLOAT, 0F)
+			.add("z", SerializableDataTypes.FLOAT, 0F),
+		data -> new Vector3f(
+			data.get("x"),
+			data.get("y"),
+			data.get("z")
+		),
+		(vector3f, serializableData) -> serializableData.instance()
+			.set("x", vector3f.x())
+			.set("y", vector3f.y())
+			.set("z", vector3f.z())
+	);
 	private static final SerializableDataType<ContainerType> CONTAINER_TYPE_FROM_REGISTRY = SerializableDataType.registry(ApoliRegistries.CONTAINER_TYPE, "apoli", true);
-
 	private static final SerializableDataType<DynamicContainerType> DYNAMIC_CONTAINER_TYPE = DynamicContainerType.DATA_FACTORY.getDataType();
-
 	public static final SerializableDataType<ContainerType> CONTAINER_TYPE = new SerializableDataType<>(
 		new Codec<>() {
 
@@ -263,48 +290,14 @@ public <T> DataResult<T> encode(ContainerType input, DynamicOps<T> ops, T prefix
 
 				if (input instanceof DynamicContainerType dynamicContainerType) {
 					return DYNAMIC_CONTAINER_TYPE.write(ops, dynamicContainerType);
-				}
-
-				else {
+				} else {
 					return CONTAINER_TYPE_FROM_REGISTRY.write(ops, input);
 				}
 
 			}
 
 		}
 	);
-
-	public static final SerializableDataType<Vec3i> VECTOR_3_INT = SerializableDataType.compound(
-		new SerializableData()
-			.add("x", SerializableDataTypes.INT, 0)
-			.add("y", SerializableDataTypes.INT, 0)
-			.add("z", SerializableDataTypes.INT, 0),
-		data -> new Vec3i(
-			data.get("x"),
-			data.get("y"),
-			data.get("z")
-		),
-		(vec3i, serializableData) -> serializableData.instance()
-			.set("x", vec3i.getX())
-			.set("y", vec3i.getY())
-			.set("z", vec3i.getZ())
-	);
-
-	public static final SerializableDataType<Vector3f> VECTOR_3_FLOAT = SerializableDataType.compound(
-		new SerializableData()
-			.add("x", SerializableDataTypes.FLOAT, 0F)
-			.add("y", SerializableDataTypes.FLOAT, 0F)
-			.add("z", SerializableDataTypes.FLOAT, 0F),
-		data -> new Vector3f(
-			data.get("x"),
-			data.get("y"),
-			data.get("z")
-		),
-		(vector3f, serializableData) -> serializableData.instance()
-			.set("x", vector3f.x())
-			.set("y", vector3f.y())
-			.set("z", vector3f.z())
-	);
 	public static SerializableDataType<CraftingRecipe> DISALLOWING_INTERNAL_CRAFTING_RECIPE = SerializableDataTypes.RECIPE.comapFlatMap(RecipeUtil::validateCraftingRecipe, Function.identity());
 
 	@SuppressWarnings("unchecked")

origins/src/main/java/io/github/dueris/originspaper/data/ContainerType.java

@@ -1,14 +1,10 @@
 package io.github.dueris.originspaper.data;
 
-import com.google.common.base.Preconditions;
 import io.github.dueris.originspaper.util.TextAlignment;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.MenuConstructor;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
 
-import java.util.Optional;
-
 public interface ContainerType {
 
 	TextAlignment titleAlignment();

origins/src/main/java/io/github/dueris/originspaper/data/DynamicContainerType.java

@@ -7,7 +7,8 @@
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.MenuConstructor;
 
-public record DynamicContainerType(TextAlignment titleAlignment, ResourceLocation texture, int columns, int rows) implements ContainerType {
+public record DynamicContainerType(TextAlignment titleAlignment, ResourceLocation texture, int columns,
+								   int rows) implements ContainerType {
 
 	public static final TypedDataObjectFactory<DynamicContainerType> DATA_FACTORY = TypedDataObjectFactory.simple(
 		new SerializableData()

origins/src/main/java/io/github/dueris/originspaper/mixin/ClientboundBlockUpdatePacketMixin.java

@@ -1,7 +1,6 @@
 package io.github.dueris.originspaper.mixin;
 
 import io.github.dueris.originspaper.access.BlockStateOwner;
-import net.minecraft.core.SectionPos;
 import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;

origins/src/main/java/io/github/dueris/originspaper/mixin/ClientboundSectionBlocksUpdatePacketMixin.java

@@ -1,6 +1,5 @@
 package io.github.dueris.originspaper.mixin;
 
-import io.github.dueris.originspaper.access.BlockStateOwner;
 import io.github.dueris.originspaper.access.SectionBlocksOwner;
 import net.minecraft.core.SectionPos;
 import net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket;
@@ -14,11 +13,17 @@
  */
 @Mixin(ClientboundSectionBlocksUpdatePacket.class)
 public class ClientboundSectionBlocksUpdatePacketMixin implements SectionBlocksOwner {
-	@Shadow @Final private BlockState[] states;
+	@Shadow
+	@Final
+	private BlockState[] states;
 
-	@Shadow @Final private SectionPos sectionPos;
+	@Shadow
+	@Final
+	private SectionPos sectionPos;
 
-	@Shadow @Final private short[] positions;
+	@Shadow
+	@Final
+	private short[] positions;
 
 	@Override
 	public void apoli$setBlockStates(BlockState[] states) {

origins/src/main/java/io/github/dueris/originspaper/mixin/ItemEntityMixin.java

@@ -26,24 +26,26 @@
 @Mixin(ItemEntity.class)
 public abstract class ItemEntityMixin extends Entity {
 
-	@Shadow @Nullable public UUID thrower;
-
-	@Shadow public abstract void setItem(ItemStack stack);
-
-	@Shadow public abstract ItemStack getItem();
+	@Shadow
+	@Nullable
+	public UUID thrower;
 
 	public ItemEntityMixin(EntityType<?> type, Level world) {
 		super(type, world);
 	}
 
+	@Shadow
+	public abstract ItemStack getItem();
+
+	@Shadow
+	public abstract void setItem(ItemStack stack);
+
 	@WrapOperation(method = "playerTouch", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Inventory;add(Lnet/minecraft/world/item/ItemStack;)Z"))
 	private boolean apoli$onItemPickup(Inventory playerInventory, ItemStack stack, Operation<Boolean> original, Player player) {
 
 		if (PreventItemPickupPowerType.doesPrevent(originspaper$thisAsItemEntity(), player)) {
 			return false;
-		}
-
-		else if (Util.hasSpaceInInventory(playerInventory, stack)) {
+		} else if (Util.hasSpaceInInventory(playerInventory, stack)) {
 
 			SlotAccess stackReference = InventoryUtil.createStackReference(stack);
 			Entity thrower = Util.getEntityByUuid(this.thrower, this.getServer());

origins/src/main/java/io/github/dueris/originspaper/mixin/ServerCommonPacketListenerImplMixin.java

@@ -21,7 +21,9 @@
 @Mixin(ServerCommonPacketListenerImpl.class)
 public class ServerCommonPacketListenerImplMixin {
 
-	@Shadow @Final protected ServerPlayer player;
+	@Shadow
+	@Final
+	protected ServerPlayer player;
 
 	@Inject(method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V", at = @At("HEAD"))
 	public void apoli$modifyBlockRender(Packet<?> packet, PacketSendListener callbacks, CallbackInfo ci) {

origins/src/main/java/io/github/dueris/originspaper/power/Power.java

@@ -22,8 +22,9 @@
 import net.minecraft.world.entity.Entity;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
-import java.util.function.Function;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 public class Power implements Validatable {