lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imperfect ritual system hopefully works correctly now

Browse source
This commit is contained in:
Nick 2015-11-02 18:00:48 -08:00
parent 92bf7cc35b
commit d285736ca9
9 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java
View file

@ -11,7 +11,7 @@ import java.util.ArrayList;
public class ImperfectRitualRegistry {
private static final BiMap<ImperfectRitual, Boolean> enabledRituals = HashBiMap.create();
public static final BiMap<ImperfectRitual, Boolean> enabledRituals = HashBiMap.create();
private static final BiMap<String, ImperfectRitual> registry = HashBiMap.create();
/**

2
src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java
View file

@ -9,7 +9,7 @@ import java.util.ArrayList;
public class RitualRegistry {
private static final BiMap<Ritual, Boolean> enabledRituals = HashBiMap.create();
public static final BiMap<Ritual, Boolean> enabledRituals = HashBiMap.create();
private static final BiMap<String, Ritual> registry = HashBiMap.create();
/**

2
src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.api.ritual;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.minecraft.entity.player.EntityPlayer;
@ -9,6 +10,7 @@ import java.util.ArrayList;
@Getter
@RequiredArgsConstructor
@EqualsAndHashCode
public abstract class Ritual {
private final String name;

2
src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java
View file

@ -1,12 +1,14 @@
package WayofTime.bloodmagic.api.ritual.imperfect;
import WayofTime.bloodmagic.api.BlockStack;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.minecraft.entity.player.EntityPlayer;
@RequiredArgsConstructor
@Getter
@EqualsAndHashCode
public abstract class ImperfectRitual {
private final String name;

4
src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java
View file

@ -32,11 +32,11 @@ public class RitualHelper {
}
public static void checkImperfectRituals(Configuration config, String packageName, String category) {
checkRituals(config, packageName, category, ImperfectRitual.class, ImperfectRitualRegistry.getEnabledMap());
checkRituals(config, packageName, category, ImperfectRitual.class, ImperfectRitualRegistry.enabledRituals);
}
public static void checkRituals(Configuration config, String packageName, String category) {
checkRituals(config, packageName, category, Ritual.class, RitualRegistry.getEnabledMap());
checkRituals(config, packageName, category, Ritual.class, RitualRegistry.enabledRituals);
}
/**