From 9eda6dc1cea3cbb86d183fa80aea8967721c1fc9 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Tue, 11 Aug 2026 13:14:49 +0100 Subject: [PATCH] Attempt to force files to use LF - Add .gitattributes to prevent Git doing auto CRLF. - Add .editorconfig file to encourage editors to write LF. --- .editorconfig | 16 +++ .gitattributes | 13 ++ .../li/cil/oc/common/item/BasicItem.scala | 22 ++-- .../li/cil/oc/server/loot/CopyColor.java | 116 +++++++++--------- 4 files changed, 98 insertions(+), 69 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..2197b5e1c1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +indent_size = 4 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.lua] +indent_size = 2 + +[*.scala] +indent_size = 2 + diff --git a/.gitattributes b/.gitattributes index c9a16b7f32..124241ea25 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,15 @@ # Ignore changes in generated files src/main/generatedResources/** linguist-generated + +* text=auto + +*.gradle eol=lf diff=java +*.java eol=lf diff=java +*.json eol=lf +*.scala eol=lf +*.lua eol=lf +*.md eol=lf diff=markdown +*.txt eol=lf + +*.png binary +*.jar binary diff --git a/src/main/scala/li/cil/oc/common/item/BasicItem.scala b/src/main/scala/li/cil/oc/common/item/BasicItem.scala index b953568ad8..7a0a2199e8 100644 --- a/src/main/scala/li/cil/oc/common/item/BasicItem.scala +++ b/src/main/scala/li/cil/oc/common/item/BasicItem.scala @@ -1,14 +1,14 @@ -package li.cil.oc.common.item - -import net.minecraft.world.item.Item -import net.minecraft.world.item.Item.Properties -import net.neoforged.neoforge.common.extensions.IItemExtension - - -final class BasicItem(props: Properties, name: String) extends Item(props) with traits.SimpleItem with IItemExtension { - unlocalizedName = name -} - +package li.cil.oc.common.item + +import net.minecraft.world.item.Item +import net.minecraft.world.item.Item.Properties +import net.neoforged.neoforge.common.extensions.IItemExtension + + +final class BasicItem(props: Properties, name: String) extends Item(props) with traits.SimpleItem with IItemExtension { + unlocalizedName = name +} + final class BasicTieredItem(props: Properties, name: String) extends Item(props) with traits.SimpleItem with traits.ItemTier with IItemExtension { unlocalizedName = name } diff --git a/src/main/scala/li/cil/oc/server/loot/CopyColor.java b/src/main/scala/li/cil/oc/server/loot/CopyColor.java index 3e4a5b5e67..ed95ff97b4 100644 --- a/src/main/scala/li/cil/oc/server/loot/CopyColor.java +++ b/src/main/scala/li/cil/oc/server/loot/CopyColor.java @@ -1,46 +1,46 @@ -package li.cil.oc.server.loot; - -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; +package li.cil.oc.server.loot; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import li.cil.oc.api.internal.Colored; import li.cil.oc.util.ItemColorizer; import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.storage.loot.LootContext; -import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction; -import net.minecraft.world.level.storage.loot.functions.LootItemFunction; -import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; -import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -public final class CopyColor extends LootItemConditionalFunction { - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( - instance -> commonFields(instance).apply(instance, CopyColor::new) - ); - - private CopyColor(List conditions) { - super(conditions); - } - - @Override - public LootItemFunctionType getType() { - return LootFunctions.COPY_COLOR.get(); - } - - public static LootItemConditionalFunction.Builder copyColor() { - return simpleBuilder(CopyColor::new); - } - - @Override - public @NotNull ItemStack run(ItemStack stack, @NotNull LootContext ctx) { - if (stack.isEmpty()) return stack; - - BlockEntity be = ctx.getParamOrNull(LootContextParams.BLOCK_ENTITY); - +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction; +import net.minecraft.world.level.storage.loot.functions.LootItemFunction; +import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; +import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public final class CopyColor extends LootItemConditionalFunction { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( + instance -> commonFields(instance).apply(instance, CopyColor::new) + ); + + private CopyColor(List conditions) { + super(conditions); + } + + @Override + public LootItemFunctionType getType() { + return LootFunctions.COPY_COLOR.get(); + } + + public static LootItemConditionalFunction.Builder copyColor() { + return simpleBuilder(CopyColor::new); + } + + @Override + public @NotNull ItemStack run(ItemStack stack, @NotNull LootContext ctx) { + if (stack.isEmpty()) return stack; + + BlockEntity be = ctx.getParamOrNull(LootContextParams.BLOCK_ENTITY); + if (be instanceof Colored colored) { int color = colored.getColor(); if (color == 0xABABAB) { @@ -48,21 +48,21 @@ public static LootItemConditionalFunction.Builder copyColor() { } else { ItemColorizer.setColor(stack, color); } - } else { - ItemColorizer.removeColor(stack); - } - return stack; - } - - public static final class Builder extends LootItemConditionalFunction.Builder { - @Override - public LootItemFunction build() { - return new CopyColor(getConditions()); - } - - @Override - protected Builder getThis() { - return this; - } - } -} + } else { + ItemColorizer.removeColor(stack); + } + return stack; + } + + public static final class Builder extends LootItemConditionalFunction.Builder { + @Override + public LootItemFunction build() { + return new CopyColor(getConditions()); + } + + @Override + protected Builder getThis() { + return this; + } + } +}