Register brews using the util method

This commit is contained in:
Vincent Lee committed 2020-06-23 12:39:53 -05:00
1 parent 6d36357bce
commit b260b74ba8
2 files changed
+50 -33

No files matched your search

@@ -144,7 +144,7 @@ public class Botania {
modBus.addGenericListener(EntityType.class, ModEntities::registerEntities);
modBus.addGenericListener(IRecipeSerializer.class, ModRecipeTypes::register);
modBus.addGenericListener(SoundEvent.class, ModSounds::registerSounds);
modBus.addGenericListener(Brew.class, ModBrews::register);
modBus.addGenericListener(Brew.class, ModBrews::registerBrews);
modBus.addListener(ModBrews::registerRegistry);
modBus.addGenericListener(Effect.class, ModPotions::registerPotions);
modBus.addGenericListener(Block.class, ModBlocks::registerBlocks);
@@ -22,33 +22,34 @@ import vazkii.botania.common.lib.LibBrewNames;
import java.util.Arrays;
import static vazkii.botania.common.block.ModBlocks.register;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
public class ModBrews {
public static IForgeRegistry<Brew> registry;
public static final Brew fallbackBrew = make("fallback", 0, 0);
public static final Brew speed = make(LibBrewNames.SPEED, 0x59B7FF, 4000, new EffectInstance(Effects.SPEED, 1800, 1));
public static final Brew strength = make(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new EffectInstance(Effects.STRENGTH, 1800, 1));
public static final Brew haste = make(LibBrewNames.HASTE, 0xF4A432, 4000, new EffectInstance(Effects.HASTE, 1800, 1));
public static final Brew healing = make(LibBrewNames.HEALING, 0xFF5ECC, 6000, new EffectInstance(Effects.INSTANT_HEALTH, 1, 1));
public static final Brew jumpBoost = make(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new EffectInstance(Effects.JUMP_BOOST, 1800, 1));
public static final Brew regen = make(LibBrewNames.REGEN, 0xFD6488, 7000, new EffectInstance(Effects.REGENERATION, 500, 1));
public static final Brew regenWeak = make(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new EffectInstance(Effects.REGENERATION, 2400, 0));
public static final Brew resistance = make(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new EffectInstance(Effects.RESISTANCE, 1800, 1));
public static final Brew fireResistance = make(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new EffectInstance(Effects.FIRE_RESISTANCE, 9600, 0));
public static final Brew waterBreathing = make(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new EffectInstance(Effects.WATER_BREATHING, 9600, 0));
public static final Brew invisibility = make(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new EffectInstance(Effects.INVISIBILITY, 9600, 0)).setNotBloodPendantInfusable();
public static final Brew nightVision = make(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new EffectInstance(Effects.NIGHT_VISION, 9600, 0));
public static final Brew absorption = make(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new EffectInstance(Effects.ABSORPTION, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable();
public static final Brew fallbackBrew = new Brew(0, 0);
public static final Brew speed = new Brew(0x59B7FF, 4000, new EffectInstance(Effects.SPEED, 1800, 1));
public static final Brew strength = new Brew(0xEE3F3F, 4000, new EffectInstance(Effects.STRENGTH, 1800, 1));
public static final Brew haste = new Brew(0xF4A432, 4000, new EffectInstance(Effects.HASTE, 1800, 1));
public static final Brew healing = new Brew(0xFF5ECC, 6000, new EffectInstance(Effects.INSTANT_HEALTH, 1, 1));
public static final Brew jumpBoost = new Brew(0x32F46D, 4000, new EffectInstance(Effects.JUMP_BOOST, 1800, 1));
public static final Brew regen = new Brew(0xFD6488, 7000, new EffectInstance(Effects.REGENERATION, 500, 1));
public static final Brew regenWeak = new Brew(0xFD6488, 9000, new EffectInstance(Effects.REGENERATION, 2400, 0));
public static final Brew resistance = new Brew(0xB44E17, 4000, new EffectInstance(Effects.RESISTANCE, 1800, 1));
public static final Brew fireResistance = new Brew(0xF86900, 4000, new EffectInstance(Effects.FIRE_RESISTANCE, 9600, 0));
public static final Brew waterBreathing = new Brew(0x84A7CF, 4000, new EffectInstance(Effects.WATER_BREATHING, 9600, 0));
public static final Brew invisibility = new Brew(0xAEAEAE, 8000, new EffectInstance(Effects.INVISIBILITY, 9600, 0)).setNotBloodPendantInfusable();
public static final Brew nightVision = new Brew(0x7C4BEB, 4000, new EffectInstance(Effects.NIGHT_VISION, 9600, 0));
public static final Brew absorption = new Brew(0xF2EB23, 7000, new EffectInstance(Effects.ABSORPTION, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable();
public static final Brew allure = make(LibBrewNames.ALLURE, 2000, new EffectInstance(ModPotions.allure, 4800, 0));
public static final Brew soulCross = make(LibBrewNames.SOUL_CROSS, 10000, new EffectInstance(ModPotions.soulCross, 1800, 0));
public static final Brew featherfeet = make(LibBrewNames.FEATHER_FEET, 7000, new EffectInstance(ModPotions.featherfeet, 1800, 0));
public static final Brew emptiness = make(LibBrewNames.EMPTINESS, 30000, new EffectInstance(ModPotions.emptiness, 7200, 0));
public static final Brew bloodthirst = make(LibBrewNames.BLOODTHIRST, 20000, new EffectInstance(ModPotions.bloodthrst, 7200, 0));
public static final Brew overload = make(LibBrewNames.OVERLOAD, 0x232323, 12000, new EffectInstance(Effects.STRENGTH, 1800, 3), new EffectInstance(Effects.SPEED, 1800, 2), new EffectInstance(Effects.WEAKNESS, 3600, 1), new EffectInstance(Effects.HUNGER, 200, 2));
public static final Brew clear = make(LibBrewNames.CLEAR, 4000, new EffectInstance(ModPotions.clear, 0, 0));
public static final Brew allure = make(2000, new EffectInstance(ModPotions.allure, 4800, 0));
public static final Brew soulCross = make(10000, new EffectInstance(ModPotions.soulCross, 1800, 0));
public static final Brew featherfeet = make(7000, new EffectInstance(ModPotions.featherfeet, 1800, 0));
public static final Brew emptiness = make(30000, new EffectInstance(ModPotions.emptiness, 7200, 0));
public static final Brew bloodthirst = make(20000, new EffectInstance(ModPotions.bloodthrst, 7200, 0));
public static final Brew overload = new Brew(0x232323, 12000, new EffectInstance(Effects.STRENGTH, 1800, 3), new EffectInstance(Effects.SPEED, 1800, 2), new EffectInstance(Effects.WEAKNESS, 3600, 1), new EffectInstance(Effects.HUNGER, 200, 2));
public static final Brew clear = make(4000, new EffectInstance(ModPotions.clear, 0, 0));
public static Brew warpWard;
@@ -61,22 +62,38 @@ public class ModBrews {
.create();
}
public static void register(RegistryEvent.Register<Brew> evt) {
evt.getRegistry().registerAll(fallbackBrew, speed, strength, haste, healing, jumpBoost, regen, regenWeak, resistance,
fireResistance, waterBreathing, invisibility, nightVision, absorption, overload, soulCross, featherfeet,
emptiness, bloodthirst, allure, clear);
public static void registerBrews(RegistryEvent.Register<Brew> evt) {
IForgeRegistry<Brew> r = evt.getRegistry();
register(r, prefix("fallback"), fallbackBrew);
register(r, LibBrewNames.SPEED, speed);
register(r, LibBrewNames.STRENGTH, strength);
register(r, LibBrewNames.HASTE, haste);
register(r, LibBrewNames.HEALING, healing);
register(r, LibBrewNames.JUMP_BOOST, jumpBoost);
register(r, LibBrewNames.REGEN, regen);
register(r, LibBrewNames.REGEN_WEAK, regenWeak);
register(r, LibBrewNames.RESISTANCE, resistance);
register(r, LibBrewNames.FIRE_RESISTANCE, fireResistance);
register(r, LibBrewNames.WATER_BREATHING, waterBreathing);
register(r, LibBrewNames.INVISIBILITY, invisibility);
register(r, LibBrewNames.NIGHT_VISION, nightVision);
register(r, LibBrewNames.ABSORPTION, absorption);
register(r, LibBrewNames.OVERLOAD, overload);
register(r, LibBrewNames.SOUL_CROSS, soulCross);
register(r, LibBrewNames.FEATHER_FEET, featherfeet);
register(r, LibBrewNames.EMPTINESS, emptiness);
register(r, LibBrewNames.BLOODTHIRST, bloodthirst);
register(r, LibBrewNames.ALLURE, allure);
register(r, LibBrewNames.CLEAR, clear);
Registry.EFFECTS.getValue(new ResourceLocation("thaumcraft:warpward")).ifPresent(warpWardPotion -> {
warpWard = make(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new EffectInstance(warpWardPotion, 12000, 0)).setNotBloodPendantInfusable();
evt.getRegistry().register(warpWard);
warpWard = new Brew(0xFBBDFF, 25000, new EffectInstance(warpWardPotion, 12000, 0)).setNotBloodPendantInfusable();
register(r, LibBrewNames.WARP_WARD, warpWard);
});
}
private static Brew make(String name, int cost, EffectInstance... effects) {
return new Brew(PotionUtils.getPotionColorFromEffectList(Arrays.asList(effects)), cost, effects).setRegistryName(prefix(name));
private static Brew make(int cost, EffectInstance... effects) {
return new Brew(PotionUtils.getPotionColorFromEffectList(Arrays.asList(effects)), cost, effects);
}
private static Brew make(String name, int color, int cost, EffectInstance... effects) {
return new Brew(color, cost, effects).setRegistryName(prefix(name));
}
}