From ea518fd4d4f3c3191d93aead1729a0d715762db9 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 27 Aug 2020 20:22:05 +0200 Subject: [PATCH] Fix arbitrary config formatting --- .../acgaming/spackenmobs/misc/ModConfigs.java | 14 -------------- .../acgaming/spackenmobs/misc/ModItems.java | 19 ------------------- 2 files changed, 33 deletions(-) diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java index 9089952..9780c5a 100644 --- a/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java +++ b/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java @@ -45,90 +45,76 @@ public class ModConfigs public static boolean Schalker_spawn = true; @Name("Allow Smava Creeper to spawn?") public static boolean SmavaCreeper_spawn = true; - @Name("Allow WolfMZTE to spawn?") public static boolean WolfMZTE_spawn = true; @Name("ApoRed spawn probability:") public static int ApoRed_weight = 50; @Name("ApoRed min group size:") public static int ApoRed_min = 1; - @Name("ApoRed max group size:") public static int ApoRed_max = 4; @Name("Baka Mitai Creeper spawn probability:") public static int BakaMitaiCreeper_weight = 10; @Name("Baka Mitai Creeper min group size:") public static int BakaMitaiCreeper_min = 1; - @Name("Baka Mitai Creeper max group size:") public static int BakaMitaiCreeper_max = 2; @Name("Drachenlord spawn probability:") public static int Drachenlord_weight = 50; @Name("Drachenlord min group size:") public static int Drachenlord_min = 1; - @Name("Drachenlord max group size:") public static int Drachenlord_max = 4; @Name("Holzstammhuhn spawn probability:") public static int Holzstammhuhn_weight = 50; @Name("Holzstammhuhn min group size:") public static int Holzstammhuhn_min = 1; - @Name("Holzstammhuhn max group size:") public static int Holzstammhuhn_max = 4; @Name("Islamist spawn probability:") public static int Islamist_weight = 50; @Name("Islamist min group size:") public static int Islamist_min = 1; - @Name("Islamist max group size:") public static int Islamist_max = 4; @Name("Jens spawn probability:") public static int Jens_weight = 25; @Name("Jens min group size:") public static int Jens_min = 1; - @Name("Jens max group size:") public static int Jens_max = 4; @Name("Marcell D'Avis spawn probability:") public static int MarcellDAvis_weight = 50; @Name("Marcell D'Avis min group size:") public static int MarcellDAvis_min = 1; - @Name("Marcell D'Avis max group size:") public static int MarcellDAvis_max = 4; @Name("Mr. Bean spawn probability:") public static int MrBean_weight = 50; @Name("Mr. Bean min group size:") public static int MrBean_min = 1; - @Name("Mr. Bean max group size:") public static int MrBean_max = 4; @Name("Schalker spawn probability:") public static int Schalker_weight = 50; @Name("Schalker min group size:") public static int Schalker_min = 1; - @Name("Schalker max group size:") public static int Schalker_max = 4; @Name("Smava Creeper spawn probability:") public static int SmavaCreeper_weight = 25; @Name("Smava Creeper min group size:") public static int SmavaCreeper_min = 1; - @Name("Smava Creeper max group size:") public static int SmavaCreeper_max = 4; @Name("WolfMZTE spawn probability:") public static int WolfMZTE_weight = 50; @Name("WolfMZTE min group size:") public static int WolfMZTE_min = 1; - @Name("WolfMZTE max group size:") public static int WolfMZTE_max = 4; - @Name("Time in seconds Jens needs to digest:") public static int Jens_digest_time = 10; - @Name("Maximum distance in blocks Jens can search for fish:") public static double Jens_search_distance = 10.0; } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java index dc413ca..8c9be5c 100644 --- a/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java +++ b/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java @@ -2,13 +2,7 @@ package mod.acgaming.spackenmobs.misc; import mod.acgaming.spackenmobs.Spackenmobs; import mod.acgaming.spackenmobs.items.ItemBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Spackenmobs.MODID) @@ -17,17 +11,4 @@ public class ModItems public static final Item RAM = new ItemBase("ram", Spackenmobs.SPACKENMOBS_TAB); public static final Item RAM_ON_A_STICK = new ItemBase("ram_on_a_stick", Spackenmobs.SPACKENMOBS_TAB); public static final Item SURSTROEMMING = new ItemBase("surstroemming", Spackenmobs.SPACKENMOBS_TAB); - - @SubscribeEvent - public void SurstroemmingEvent(PlayerTickEvent event) - { - if (event.player instanceof EntityPlayer) - { - EntityPlayer player = event.player; - if (player.inventory.hasItemStack(new ItemStack(ModItems.SURSTROEMMING))) - { - player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 100)); - } - } - } } \ No newline at end of file