magic-server/L2Core
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
lcy0x1
2024-07-12 19:11:22 +08:00
parent ee7d9ccee9
commit 526630b08c
35 changed files with 394 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/dev/xkmc/l2core/base/effects/ForceAddEffectEvent.java
View File

@@ -2,7 +2,6 @@ package dev.xkmc.l2core.base.effects;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.LivingEntity;
import net.neoforged.bus.api.Event;
import net.neoforged.bus.api.ICancellableEvent;
import net.neoforged.neoforge.event.entity.living.MobEffectEvent;
import org.jetbrains.annotations.NotNull;

1
src/main/java/dev/xkmc/l2core/capability/attachment/AttachmentDef.java
View File

@@ -7,7 +7,6 @@ import net.minecraft.nbt.CompoundTag;
import net.neoforged.neoforge.attachment.AttachmentType;
import net.neoforged.neoforge.attachment.IAttachmentHolder;
import net.neoforged.neoforge.attachment.IAttachmentSerializer;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
import java.util.function.Supplier;

1
src/main/java/dev/xkmc/l2core/capability/attachment/BaseAttachment.java
View File

@@ -3,5 +3,4 @@ package dev.xkmc.l2core.capability.attachment;
public class BaseAttachment {
}

2
src/main/java/dev/xkmc/l2core/capability/conditionals/ConditionalToken.java
View File

@@ -15,7 +15,7 @@ public class ConditionalToken {
/**
* return true to retain
* */
*/
public boolean retainOnDeath(Player player) {
return false;
}

1
src/main/java/dev/xkmc/l2core/capability/player/PlayerCapToClient.java
View File

@@ -7,7 +7,6 @@ import dev.xkmc.l2serial.serialization.marker.SerialField;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
import java.util.function.Predicate;

2
src/main/java/dev/xkmc/l2core/compat/patchouli/PatchouliHelper.java
View File

@@ -4,7 +4,6 @@ import com.tterrag.registrate.providers.ProviderType;
import com.tterrag.registrate.util.DataIngredient;
import dev.xkmc.l2core.init.reg.registrate.L2Registrate;
import dev.xkmc.l2core.serial.recipe.ConditionalRecipeWrapper;
import net.minecraft.Util;
import net.minecraft.data.recipes.RecipeBuilder;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceKey;
@@ -16,7 +15,6 @@ import net.minecraft.world.level.storage.loot.LootPool;
import net.minecraft.world.level.storage.loot.LootTable;
import net.neoforged.neoforge.client.model.generators.ModelFile;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class PatchouliHelper {

1
src/main/java/dev/xkmc/l2core/init/reg/ench/EECVal.java
View File

@@ -105,6 +105,7 @@ public interface EECVal<T> extends Val<DataComponentType<List<ConditionalEffect<
}
}
interface Special<T> extends Val<DataComponentType<T>> {
record Impl<T>(

1
src/main/java/dev/xkmc/l2core/init/reg/ench/LegacyEnchantment.java
View File

@@ -3,5 +3,4 @@ package dev.xkmc.l2core.init.reg.ench;
public class LegacyEnchantment {
}

4
src/main/java/dev/xkmc/l2core/serial/advancements/BaseCriterion.java
View File

@@ -2,11 +2,7 @@ package dev.xkmc.l2core.serial.advancements;
import com.mojang.serialization.Codec;
import dev.xkmc.l2serial.serialization.codec.CodecAdaptor;
import net.minecraft.advancements.critereon.ContextAwarePredicate;
import net.minecraft.advancements.critereon.SimpleCriterionTrigger;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiFunction;
public class BaseCriterion<T extends BaseCriterionInstance<T, R>, R extends BaseCriterion<T, R>> extends SimpleCriterionTrigger<T> {

2
src/main/java/dev/xkmc/l2core/serial/advancements/CriterionBuilder.java
View File

@@ -76,7 +76,7 @@ public class CriterionBuilder implements IAdvBuilder {
}
public enum RequirementsStrategy {
AND, OR;
AND, OR
}
public static CriterionBuilder and() {

2
src/main/java/dev/xkmc/l2core/serial/loot/AddItemModifier.java
View File

@@ -22,7 +22,7 @@ public class AddItemModifier extends LootModifier {
public static final MapCodec<AddItemModifier> MAP_CODEC = RecordCodecBuilder.mapCodec(i -> LootModifier.codecStart(i).and(i.group(
BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter(m -> m.item),
BuiltInRegistries.ITEM.byNameCodec().optionalFieldOf("fail").forGetter(m -> m.fail == Items.AIR ? Optional.<Item>empty() : Optional.of(m.fail)),
BuiltInRegistries.ITEM.byNameCodec().optionalFieldOf("fail").forGetter(m -> m.fail == Items.AIR ? Optional.empty() : Optional.of(m.fail)),
DoubleConfigValue.CODEC.optionalFieldOf("chance")
.forGetter(m -> Optional.ofNullable(m.chance))
)).apply(i, AddItemModifier::new));

1
src/main/java/dev/xkmc/l2core/serial/recipe/AbstractSmithingRecipe.java
View File

@@ -1,6 +1,5 @@
package dev.xkmc.l2core.serial.recipe;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.network.RegistryFriendlyByteBuf;

2
src/main/java/dev/xkmc/l2core/serial/recipe/BaseRecipe.java
View File

@@ -1,8 +1,6 @@
package dev.xkmc.l2core.serial.recipe;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.RegistryAccess;
import net.minecraft.world.Container;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeInput;

1
src/main/java/dev/xkmc/l2core/serial/recipe/BaseRecipeBuilder.java
View File

@@ -9,7 +9,6 @@ import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.data.recipes.RecipeBuilder;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.Container;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.crafting.RecipeInput;
import org.jetbrains.annotations.Nullable;

1
src/main/java/dev/xkmc/l2core/serial/recipe/RecSerializer.java
View File

@@ -7,7 +7,6 @@ import dev.xkmc.l2serial.util.Wrappers;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.Container;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeInput;
import net.minecraft.world.item.crafting.RecipeSerializer;