Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make static final fields public #58

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Make static final fields public #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ public class RitualEffectWellOfSuffering extends RitualEffect {

public static final int timeDelay = 25;
public static final int amount = AlchemicalWizardry.lpPerSacrificeWellOfSuffering;

private static final int tennebraeDrain = 5;
private static final int potentiaDrain = 10;
private static final int offensaDrain = 3;
public static final int tennebraeDrain = 5;
public static final int potentiaDrain = 10;
public static final int offensaDrain = 3;

@Override
public void performEffect(IMasterRitualStone ritualStone) {
Expand All @@ -36,7 +35,7 @@ public void performEffect(IMasterRitualStone ritualStone) {
int y = ritualStone.getYCoord();
int z = ritualStone.getZCoord();

if (world.getWorldTime() % this.timeDelay != 0) {
if (world.getWorldTime() % timeDelay != 0) {
return;
}

Expand All @@ -62,13 +61,8 @@ public void performEffect(IMasterRitualStone ritualStone) {

int d0 = 10;
int vertRange = hasPotentia ? 20 : 10;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox(
(double) x,
(double) y,
(double) z,
(double) (x + 1),
(double) (y + 1),
(double) (z + 1)).expand(d0, vertRange, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox(x, y, z, (x + 1), (y + 1), (z + 1))
.expand(d0, vertRange, d0);
List<EntityLivingBase> list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);

int entityCount = 0;
Expand All @@ -93,7 +87,7 @@ public void performEffect(IMasterRitualStone ritualStone) {
&& this.canDrainReagent(ritualStone, ReagentRegistry.tenebraeReagent, tennebraeDrain, true);

entityCount++;
tileAltar.sacrificialDaggerCall(this.amount * (hasTennebrae ? 2 : 1) * (hasOffensa ? 2 : 1), true);
tileAltar.sacrificialDaggerCall(amount * (hasTennebrae ? 2 : 1) * (hasOffensa ? 2 : 1), true);
}
}

Expand All @@ -112,7 +106,7 @@ public int getCostPerRefresh() {

@Override
public List<RitualComponent> getRitualComponentList() {
ArrayList<RitualComponent> wellOfSufferingRitual = new ArrayList();
ArrayList<RitualComponent> wellOfSufferingRitual = new ArrayList<>();
wellOfSufferingRitual.add(new RitualComponent(1, 0, 1, RitualComponent.FIRE));
wellOfSufferingRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE));
wellOfSufferingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.FIRE));
Expand Down