Skip to content

Commit

Permalink
Normalise filenames.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Provismet
Provismet committed Jun 25, 2024
1 parent 7c15aa2 commit b99d096
Show file tree
Hide file tree
Showing 24 changed files with 99 additions and 98 deletions.
18 changes: 10 additions & 8 deletions src/main/java/com/provismet/CombatPlusCore/CPCMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

import com.provismet.CombatPlusCore.debug.registries.CPCDebugItems;
import com.provismet.CombatPlusCore.enchantment.component.CPCEnchantmentComponents;
import com.provismet.CombatPlusCore.registries.CPCDoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.CPCEnchantmentDoubleEntityEffects;
import com.provismet.CombatPlusCore.registries.CPCEnchantmentSingleEntityEffects;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.DoubleEntityEffects;
import com.provismet.CombatPlusCore.registries.DoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.ItemConditionTypes;
import com.provismet.CombatPlusCore.registries.LambdaRegistry;
import com.provismet.CombatPlusCore.registries.SingleEntityEffects;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.utility.item.CPCItemGroups;
import com.provismet.CombatPlusCore.utility.CPCRegistries;
import com.provismet.CombatPlusCore.utility.resource.CPCResourceConditions;
Expand Down Expand Up @@ -37,14 +38,15 @@ public static Identifier identifier (String path) {
public void onInitialize () {
CPCRegistries.init();
CPCEnchantmentComponents.init();
CPCSingleEntityLootConditionTypes.init();
CPCDoubleEntityLootConditionTypes.init();
SingleEntityLootConditionTypes.init();
DoubleEntityLootConditionTypes.init();
ItemConditionTypes.init();
CPCResourceConditions.register();
CPCEnchantmentDoubleEntityEffects.register();
DoubleEntityEffects.register();
LambdaRegistry.register();
CPCGameRules.register();
CPCItemGroups.register();
CPCEnchantmentSingleEntityEffects.register();
SingleEntityEffects.register();

if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
LOGGER.warn("Combat+ Core development code is running. If you see this, you should be in a development environment.");
Expand Down
4 changes: 2 additions & 2 deletions ...rovismet/CombatPlusCore/enchantment/loot/condition/doubleEntity/ApplyToBothCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContext;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContextParameters;
import com.provismet.CombatPlusCore.registries.CPCDoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.DoubleEntityLootConditionTypes;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.condition.EntityPropertiesLootCondition;
Expand Down Expand Up @@ -42,7 +42,7 @@ public Set<LootContextParameter<?>> getRequiredParameters() {

@Override
public LootConditionType getType () {
return CPCDoubleEntityLootConditionTypes.APPLY_TO_BOTH;
return DoubleEntityLootConditionTypes.APPLY_TO_BOTH;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...vismet/CombatPlusCore/enchantment/loot/condition/doubleEntity/ApplyToTargetCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContext;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContextParameters;
import com.provismet.CombatPlusCore.registries.CPCDoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.DoubleEntityLootConditionTypes;
import net.minecraft.loot.condition.EntityPropertiesLootCondition;
import net.minecraft.loot.condition.LootCondition;
import net.minecraft.loot.condition.LootConditionType;
Expand All @@ -25,7 +25,7 @@ protected ApplyToTargetCondition (LootCondition condition) {

@Override
public LootConditionType getType () {
return CPCDoubleEntityLootConditionTypes.APPLY_TO_TARGET;
return DoubleEntityLootConditionTypes.APPLY_TO_TARGET;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...rovismet/CombatPlusCore/enchantment/loot/condition/doubleEntity/ApplyToUserCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.provismet.CombatPlusCore.enchantment.loot.condition.DoubleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContext;
import com.provismet.CombatPlusCore.registries.CPCDoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.DoubleEntityLootConditionTypes;
import net.minecraft.loot.condition.EntityPropertiesLootCondition;
import net.minecraft.loot.condition.LootCondition;
import net.minecraft.loot.condition.LootConditionType;
Expand All @@ -24,7 +24,7 @@ protected ApplyToUserCondition (LootCondition condition) {

@Override
public LootConditionType getType () {
return CPCDoubleEntityLootConditionTypes.APPLY_TO_USER;
return DoubleEntityLootConditionTypes.APPLY_TO_USER;
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions ...t/CombatPlusCore/enchantment/loot/condition/doubleEntity/DoubleEntityLambdaCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.provismet.CombatPlusCore.enchantment.loot.condition.DoubleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContextParameters;
import com.provismet.CombatPlusCore.registries.CPCDoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.DoubleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.utility.CPCRegistries;
import net.minecraft.entity.Entity;
import net.minecraft.loot.condition.LootCondition;
import net.minecraft.loot.condition.LootConditionType;
import net.minecraft.loot.context.LootContext;
import net.minecraft.loot.context.LootContextParameters;
Expand All @@ -27,7 +26,7 @@ public record DoubleEntityLambdaCondition (Identifier function) implements Doubl

@Override
public LootConditionType getType () {
return CPCDoubleEntityLootConditionTypes.LAMBDA;
return DoubleEntityLootConditionTypes.LAMBDA;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...ent/loot/condition/item/IsDualWeapon.java → ...condition/item/IsDualWeaponCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import net.minecraft.loot.context.LootContext;
import net.minecraft.loot.context.LootContextParameters;

public record IsDualWeapon () implements ItemCondition {
public static final MapCodec<IsDualWeapon> CODEC = MapCodec.unit(IsDualWeapon::new);
public record IsDualWeaponCondition() implements ItemCondition {
public static final MapCodec<IsDualWeaponCondition> CODEC = MapCodec.unit(IsDualWeaponCondition::new);

@Override
public LootConditionType getType () {
Expand Down
6 changes: 3 additions & 3 deletions ...nt/loot/condition/item/IsMeleeWeapon.java → ...ondition/item/IsMeleeWeaponCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import net.minecraft.loot.context.LootContext;
import net.minecraft.loot.context.LootContextParameters;

public record IsMeleeWeapon () implements ItemCondition {
public static final MapCodec<IsMeleeWeapon> CODEC = MapCodec.unit(IsMeleeWeapon::new);
public record IsMeleeWeaponCondition() implements ItemCondition {
public static final MapCodec<IsMeleeWeaponCondition> CODEC = MapCodec.unit(IsMeleeWeaponCondition::new);

@Override
public LootConditionType getType () {
Expand All @@ -25,6 +25,6 @@ public boolean test (LootContext lootContext) {
}

public static ItemCondition.Builder builder () {
return IsMeleeWeapon::new;
return IsMeleeWeaponCondition::new;
}
}
4 changes: 2 additions & 2 deletions .../provismet/CombatPlusCore/enchantment/loot/condition/singleEntity/DimensionCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.loot.condition.LootConditionType;
import net.minecraft.loot.context.LootContext;
import net.minecraft.server.world.ServerWorld;
Expand All @@ -19,7 +19,7 @@ public record DimensionCondition (Identifier dimension) implements SingleEntityC

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.DIMENSION;
return SingleEntityLootConditionTypes.DIMENSION;
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions ...condition/singleEntity/ExposedToMoon.java → .../singleEntity/ExposedToMoonCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

import com.mojang.serialization.MapCodec;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.loot.condition.LootConditionType;
import net.minecraft.loot.context.LootContext;

public record ExposedToMoon () implements SingleEntityCondition {
public static final MapCodec<ExposedToMoon> CODEC = MapCodec.unit(ExposedToMoon::new);
public record ExposedToMoonCondition() implements SingleEntityCondition {
public static final MapCodec<ExposedToMoonCondition> CODEC = MapCodec.unit(ExposedToMoonCondition::new);

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.EXPOSED_TO_MOON;
return SingleEntityLootConditionTypes.EXPOSED_TO_MOON;
}

@Override
public boolean test (LootContext lootContext) {
return lootContext.getWorld().isNight() && ExposedToSky.isSkyVisible(lootContext);
return lootContext.getWorld().isNight() && ExposedToSkyCondition.isSkyVisible(lootContext);
}

public static SingleEntityCondition.Builder builder () {
return ExposedToMoon::new;
return ExposedToMoonCondition::new;
}
}
12 changes: 6 additions & 6 deletions .../condition/singleEntity/ExposedToSky.java → ...n/singleEntity/ExposedToSkyCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@

import com.mojang.serialization.MapCodec;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.loot.condition.LootConditionType;
import net.minecraft.loot.context.LootContext;
import net.minecraft.loot.context.LootContextParameters;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;

public record ExposedToSky () implements SingleEntityCondition {
public static final MapCodec<ExposedToSky> CODEC = MapCodec.unit(ExposedToSky::new);
public record ExposedToSkyCondition() implements SingleEntityCondition {
public static final MapCodec<ExposedToSkyCondition> CODEC = MapCodec.unit(ExposedToSkyCondition::new);

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.EXPOSED_TO_SKY;
return SingleEntityLootConditionTypes.EXPOSED_TO_SKY;
}

@Override
public boolean test (LootContext lootContext) {
return ExposedToSky.isSkyVisible(lootContext);
return ExposedToSkyCondition.isSkyVisible(lootContext);
}

public static boolean isSkyVisible (LootContext lootContext) {
Expand All @@ -30,6 +30,6 @@ public static boolean isSkyVisible (LootContext lootContext) {
}

public static SingleEntityCondition.Builder builder () {
return ExposedToSky::new;
return ExposedToSkyCondition::new;
}
}
12 changes: 6 additions & 6 deletions .../condition/singleEntity/ExposedToSun.java → ...n/singleEntity/ExposedToSunCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

import com.mojang.serialization.MapCodec;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.loot.condition.LootConditionType;
import net.minecraft.loot.context.LootContext;

public record ExposedToSun () implements SingleEntityCondition {
public static final MapCodec<ExposedToSun> CODEC = MapCodec.unit(ExposedToSun::new);
public record ExposedToSunCondition() implements SingleEntityCondition {
public static final MapCodec<ExposedToSunCondition> CODEC = MapCodec.unit(ExposedToSunCondition::new);

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.EXPOSED_TO_SUN;
return SingleEntityLootConditionTypes.EXPOSED_TO_SUN;
}

@Override
public boolean test (LootContext lootContext) {
return lootContext.getWorld().isDay() && ExposedToSky.isSkyVisible(lootContext);
return lootContext.getWorld().isDay() && ExposedToSkyCondition.isSkyVisible(lootContext);
}

public static SingleEntityCondition.Builder builder () {
return ExposedToSun::new;
return ExposedToSunCondition::new;
}
}
4 changes: 2 additions & 2 deletions ...com/provismet/CombatPlusCore/enchantment/loot/condition/singleEntity/HealthCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContext;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.enchantment.EnchantmentLevelBasedValue;
import net.minecraft.entity.LivingEntity;
import net.minecraft.loot.condition.LootConditionType;
Expand All @@ -22,7 +22,7 @@ public record HealthCondition (CPCLootContext.Comparison comparison, Enchantment

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.HEALTH;
return SingleEntityLootConditionTypes.HEALTH;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...ismet/CombatPlusCore/enchantment/loot/condition/singleEntity/RelativeHealthCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContext;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.enchantment.EnchantmentLevelBasedValue;
import net.minecraft.entity.LivingEntity;
import net.minecraft.loot.condition.LootConditionType;
Expand All @@ -22,7 +22,7 @@ public record RelativeHealthCondition (CPCLootContext.Comparison comparison, Enc

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.RELATIVE_HEALTH;
return SingleEntityLootConditionTypes.RELATIVE_HEALTH;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...t/CombatPlusCore/enchantment/loot/condition/singleEntity/SingleEntityLambdaCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.utility.CPCRegistries;
import net.minecraft.entity.Entity;
import net.minecraft.loot.condition.LootConditionType;
Expand All @@ -24,7 +24,7 @@ public record SingleEntityLambdaCondition (Identifier function) implements Singl

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.LAMBDA;
return SingleEntityLootConditionTypes.LAMBDA;
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions ...ot/condition/singleEntity/TickModulo.java → ...ion/singleEntity/TickModuloCondition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.provismet.CombatPlusCore.enchantment.loot.condition.SingleEntityCondition;
import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
import com.provismet.CombatPlusCore.registries.SingleEntityLootConditionTypes;
import net.minecraft.enchantment.EnchantmentLevelBasedValue;
import net.minecraft.entity.Entity;
import net.minecraft.loot.condition.LootConditionType;
Expand All @@ -13,24 +13,24 @@
/**
* Returns true is the entity's age, in ticks, is divisible by the provided value (rounded down).
*
* @param value The value to divide by.
* @param interval The value to divide by.
*/
public record TickModulo (EnchantmentLevelBasedValue value) implements SingleEntityCondition {
public static final MapCodec<TickModulo> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(EnchantmentLevelBasedValue.CODEC.fieldOf("value").forGetter(TickModulo::value)).apply(instance, TickModulo::new));
public record TickModuloCondition(EnchantmentLevelBasedValue interval) implements SingleEntityCondition {
public static final MapCodec<TickModuloCondition> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(EnchantmentLevelBasedValue.CODEC.fieldOf("value").forGetter(TickModuloCondition::interval)).apply(instance, TickModuloCondition::new));

@Override
public LootConditionType getType () {
return CPCSingleEntityLootConditionTypes.TICK_MODULO;
return SingleEntityLootConditionTypes.TICK_MODULO;
}

@Override
public boolean test (LootContext lootContext) {
Entity entity = lootContext.get(LootContextParameters.THIS_ENTITY);
int modulo = (int)this.value.getValue(lootContext.get(LootContextParameters.ENCHANTMENT_LEVEL));
int modulo = (int)this.interval.getValue(lootContext.get(LootContextParameters.ENCHANTMENT_LEVEL));
return entity.age % modulo == 0;
}

public static SingleEntityCondition.Builder builder (EnchantmentLevelBasedValue value) {
return () -> new TickModulo(value);
return () -> new TickModuloCondition(value);
}
}
14 changes: 11 additions & 3 deletions ...es/CPCEnchantmentDoubleEntityEffects.java → ...sCore/registries/DoubleEntityEffects.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@
import com.mojang.serialization.MapCodec;
import com.provismet.CombatPlusCore.CPCMain;
import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.*;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyKnockbackEnchantmentEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyToBothEntityEnchantmentEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyToTargetEntityEnchantmentEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.ApplyToUserEntityEnchantmentEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.CodeExecutionDoubleEntityEnchantmentEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.InvertedEntityEnchantmentEffect;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.WeaponPostCharged;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.WeaponPostCritical;
import com.provismet.CombatPlusCore.enchantment.effect.doubleEntity.WeaponPostKill;
import com.provismet.CombatPlusCore.utility.CPCRegistries;
import net.minecraft.registry.Registry;

public class CPCEnchantmentDoubleEntityEffects {
public class DoubleEntityEffects {
public static void register () {
register("code_execution_double_entity", CodeExecutionDoubleEntityEnchantmentEffect.CODEC);
register("apply_to_owner", ApplyToUserEntityEnchantmentEffect.CODEC);
Expand All @@ -20,7 +28,7 @@ public static void register () {
register("weapon_post_kill", WeaponPostKill.CODEC);
}

private static <T extends CPCEnchantmentEntityEffect> void register (String name, MapCodec<T> codec) {
private static void register (String name, MapCodec<? extends CPCEnchantmentEntityEffect> codec) {
Registry.register(CPCRegistries.ENCHANTMENT_DUAL_ENTITY_EFFECT_TYPE, CPCMain.identifier(name), codec);
}
}
2 changes: 1 addition & 1 deletion ...es/CPCDoubleEntityLootConditionTypes.java → ...tries/DoubleEntityLootConditionTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;

public class CPCDoubleEntityLootConditionTypes {
public class DoubleEntityLootConditionTypes {
public static final LootConditionType LAMBDA = register("code_execution_double_entity_condition", DoubleEntityLambdaCondition.CODEC);
public static final LootConditionType APPLY_TO_BOTH = register("apply_to_both", ApplyToBothCondition.CODEC);
public static final LootConditionType APPLY_TO_USER = register("apply_to_user", ApplyToUserCondition.CODEC);
Expand Down
Loading

0 comments on commit b99d096

Please sign in to comment.