From 04831e903ad61627db0dbdf93007e4b6d26dd0e9 Mon Sep 17 00:00:00 2001 From: ACGaming <4818419+ACGaming@users.noreply.github.com> Date: Tue, 13 Oct 2020 18:27:03 +0200 Subject: [PATCH] Removed unused broken stuff --- build.gradle | 2 +- .../mod/acgaming/spackenmobs/Spackenmobs.java | 10 ++-- .../events/TauntDrachenlordEvent.java | 48 ------------------- .../spackenmobs/misc/ModKeybinds.java | 15 ------ src/main/resources/mcmod.info | 2 +- 5 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/mod/acgaming/spackenmobs/events/TauntDrachenlordEvent.java delete mode 100644 src/main/java/mod/acgaming/spackenmobs/misc/ModKeybinds.java diff --git a/build.gradle b/build.gradle index ba763a8..1b84b73 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = "RC4" +version = "RC5" group = "mod.acgaming.spackenmobs" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Spackenmobs-1.12.2" diff --git a/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java b/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java index 55d6dab..fd5be46 100644 --- a/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java +++ b/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java @@ -1,10 +1,7 @@ package mod.acgaming.spackenmobs; -import mod.acgaming.spackenmobs.events.TauntDrachenlordEvent; import mod.acgaming.spackenmobs.misc.ModEntities; -import mod.acgaming.spackenmobs.misc.ModKeybinds; import net.minecraft.creativetab.CreativeTabs; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -14,11 +11,11 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -@Mod(modid = "spackenmobs", version = "RC4", acceptedMinecraftVersions = "[1.12.2]") +@Mod(modid = "spackenmobs", version = "RC5", acceptedMinecraftVersions = "[1.12.2]") public class Spackenmobs { public static final String MODID = "spackenmobs"; - public static final String VERSION = "RC4"; + public static final String VERSION = "RC5"; public static final CreativeTabs SPACKENMOBS_TAB = new SpackenmobsTab(); @@ -41,8 +38,7 @@ public class Spackenmobs @EventHandler public void init(FMLInitializationEvent event) { - MinecraftForge.EVENT_BUS.register(new TauntDrachenlordEvent()); - ModKeybinds.init(); + } @EventHandler diff --git a/src/main/java/mod/acgaming/spackenmobs/events/TauntDrachenlordEvent.java b/src/main/java/mod/acgaming/spackenmobs/events/TauntDrachenlordEvent.java deleted file mode 100644 index 0a60246..0000000 --- a/src/main/java/mod/acgaming/spackenmobs/events/TauntDrachenlordEvent.java +++ /dev/null @@ -1,48 +0,0 @@ -package mod.acgaming.spackenmobs.events; - -import mod.acgaming.spackenmobs.entities.EntityDrachenlord; -import mod.acgaming.spackenmobs.misc.ModKeybinds; -import mod.acgaming.spackenmobs.misc.ModSoundEvents; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.InputEvent; -import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import org.lwjgl.input.Keyboard; - -import java.util.List; - -public class TauntDrachenlordEvent -{ - private void PigmanAggro(World worldIn, BlockPos pos, EntityPlayer player) - { - float radius = 64; - - BlockPos corner1 = new BlockPos(pos.getX() - radius, pos.getY() - radius, pos.getZ() - radius); - BlockPos corner2 = new BlockPos(pos.getX() + radius, pos.getY() + radius, pos.getZ() + radius); - AxisAlignedBB AABB_radius = new AxisAlignedBB(corner1, corner2); - List drachenlords = worldIn.getEntitiesWithinAABB(EntityDrachenlord.class, AABB_radius); - - for (EntityDrachenlord drachenlord : drachenlords) - { - DamageSource damageSource = new EntityDamageSourceIndirect("generic", player, player); - drachenlord.becomeAngryAt(player); - } - } - - @SubscribeEvent - public void onKeyInput(KeyInputEvent event) - { - if (ModKeybinds.taunt.isPressed()) - { - - } - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModKeybinds.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModKeybinds.java deleted file mode 100644 index bd2cfcf..0000000 --- a/src/main/java/mod/acgaming/spackenmobs/misc/ModKeybinds.java +++ /dev/null @@ -1,15 +0,0 @@ -package mod.acgaming.spackenmobs.misc; - -import net.minecraft.client.settings.KeyBinding; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import org.lwjgl.input.Keyboard; - -public class ModKeybinds -{ - public static KeyBinding taunt; - public static void init() - { - taunt = new KeyBinding("key.taunt", Keyboard.KEY_J, "key.categories.spackenmobs"); - ClientRegistry.registerKeyBinding(taunt); - } -} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index a7c3312..f946a70 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "spackenmobs", "name": "Spackenmobs", "description": "The most important mobs in the history of Minecraft! [citation needed]", - "version": "RC4", + "version": "RC5", "mcversion": "1.12.2", "url": "https://github.com/ACGaming/Spackenmobs", "updateUrl": "",