Skip to content

Commit 81f80fa

Browse files
committed
A couple small things.
1 parent 5149927 commit 81f80fa

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

src/main/java/redgear/brewcraft/api/PotionAPI.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import net.minecraft.item.Item;
44
import net.minecraft.item.ItemStack;
55
import net.minecraft.potion.Potion;
6-
import net.minecraftforge.fluids.Fluid;
76
import net.minecraftforge.fluids.FluidStack;
87

98
public class PotionAPI {

src/main/java/redgear/brewcraft/effects/EffectCreeper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.minecraft.entity.player.EntityPlayer;
66
import net.minecraft.util.DamageSource;
77
import redgear.brewcraft.plugins.common.AchievementPlugin;
8-
import redgear.brewcraft.plugins.common.DamageSourcePlugin;
98

109
public class EffectCreeper extends PotionExtension {
1110

src/main/java/redgear/brewcraft/effects/EffectImmunity.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,22 @@ public void performEffect(EntityLivingBase living, int strength) {
3030
living.removePotionEffect(Potion.confusion.id);
3131
living.removePotionEffect(Potion.blindness.id);
3232
}
33-
34-
if(strength >= 3){
33+
34+
/*if (strength >= 3) {
3535
Collection<PotionEffect> map = living.getActivePotionEffects();
3636
int id = 0;
37-
38-
for(PotionEffect effect : map){
39-
id = effect.getPotionID();
40-
41-
if(id < Potion.potionTypes.length && Potion.potionTypes[id].isBadEffect())
42-
living.removePotionEffect(id);
43-
}
44-
45-
}
37+
38+
for (PotionEffect effect : map) {
39+
id = effect.getPotionID();
40+
41+
if (id < Potion.potionTypes.length && Potion.potionTypes[id].isBadEffect())
42+
living.removePotionEffect(id);
43+
}
44+
}
4645
4746
if (living instanceof EntityPlayer && AchievementPlugin.immunity != null) {
4847
((EntityPlayer) living).addStat(AchievementPlugin.immunity, 1);
49-
}
48+
}*/
5049

5150
}
5251

src/main/java/redgear/brewcraft/plugins/common/PotionPlugin.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ public void Init(ModUtils mod) {
260260

261261
fluidHolyWater = potionRegistry.addPotion("HolyWater", EffectPlugin.angel, 10, 0, true);
262262
fluidHolyWaterII = potionRegistry.addPotion("HolyWaterII", EffectPlugin.angel, 5, 1, true);
263-
fluidHolyWaterLong = potionRegistry.addPotion("HolyWaterLong", EffectPlugin.angel, 10, 0, true);
264-
fluidHolyWaterVeryLong = potionRegistry.addPotion("HolyWaterVeryLong", EffectPlugin.angel, 20, 0, true);
263+
fluidHolyWaterLong = potionRegistry.addPotion("HolyWaterLong", EffectPlugin.angel, 20, 0, true);
264+
fluidHolyWaterVeryLong = potionRegistry.addPotion("HolyWaterVeryLong", EffectPlugin.angel, 40, 0, true);
265265
fluidHolyWaterIII = potionRegistry.addPotion("HolyWaterIII", EffectPlugin.angel, 3, 2, true);
266266
fluidFlight = potionRegistry.addPotion("Flight", EffectPlugin.flight, 15, 0);
267267
fluidFlightLong = potionRegistry.addPotion("FlightLong", EffectPlugin.flight, 30, 0);
@@ -434,10 +434,6 @@ public void postInit(ModUtils mod) {
434434
recipeRegistry.addRecipe(fluidHolyWaterII, fluidHolyWaterIII, IngredientPlugin.obsidianTear);
435435
recipeRegistry.addRecipe(fluidHolyWaterLong, fluidHolyWaterVeryLong, IngredientPlugin.pureTear);
436436
recipeRegistry.addRecipe(fluidAwkward, fluidFlight, IngredientPlugin.goldenFeather);
437-
recipeRegistry.addRecipe(fluidAntidote, fluidAntidoteII, Items.glowstone_dust);
438-
recipeRegistry.addRecipe(fluidAntidoteII, fluidAntidote, Items.redstone);
439-
recipeRegistry.addRecipe(fluidAntidote, fluidAntidoteLong, Items.redstone);
440-
recipeRegistry.addRecipe(fluidAntidoteLong, fluidAntidote, Items.glowstone_dust);
441437
recipeRegistry.addRecipe(fluidAntidoteII, fluidAntidoteIII, IngredientPlugin.obsidianTear);
442438
recipeRegistry.addRecipe(fluidAntidoteLong, fluidAntidoteVeryLong, IngredientPlugin.pureTear);
443439
recipeRegistry.addRecipe(fluidWither, fluidBoom, Items.gunpowder);

0 commit comments

Comments
 (0)