diff --git a/src/main/java/ru/octol1ttle/knockdowns/client/ClientProxy.java b/src/main/java/ru/octol1ttle/knockdowns/client/ClientProxy.java index 1a0fbf1..bb97d96 100644 --- a/src/main/java/ru/octol1ttle/knockdowns/client/ClientProxy.java +++ b/src/main/java/ru/octol1ttle/knockdowns/client/ClientProxy.java @@ -5,11 +5,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import ru.octol1ttle.knockdowns.client.event.KnockdownsKeyListener; import ru.octol1ttle.knockdowns.common.IClientProxy; +import ru.octol1ttle.knockdowns.common.KnockdownsMod; @SideOnly(Side.CLIENT) public class ClientProxy implements IClientProxy { @Override public void onFMLInit(FMLInitializationEvent event) { + KnockdownsMod.LOGGER.info("Registering key bindings"); KnockdownsKeyListener.registerKeyBindings(); } } diff --git a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsCommonEventListener.java b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsCommonEventListener.java index 1b8b252..5328da7 100644 --- a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsCommonEventListener.java +++ b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsCommonEventListener.java @@ -46,7 +46,9 @@ import static ru.octol1ttle.knockdowns.common.KnockdownsUtils.resetKnockedState; @Mod.EventBusSubscriber(modid = Tags.MOD_ID) public class KnockdownsCommonEventListener { public static void onFMLInit(FMLInitializationEvent event) { + KnockdownsMod.LOGGER.info("Registering network packets"); KnockdownsNetwork.registerPackets(); + KnockdownsMod.LOGGER.info("Registering capability"); KnockdownsCapability.register(); } diff --git a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsMod.java b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsMod.java index d9e27c0..49e365c 100644 --- a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsMod.java +++ b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsMod.java @@ -15,6 +15,7 @@ public class KnockdownsMod { @Mod.EventHandler public void onFMLInit(FMLInitializationEvent event) { + LOGGER.info("Initializing"); clientProxy.onFMLInit(event); KnockdownsCommonEventListener.onFMLInit(event); } diff --git a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java index 207a0ab..d87763f 100644 --- a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java +++ b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java @@ -24,7 +24,7 @@ public class KnockdownsUtils { return false; } } - return false; + return true; } public static void resetKnockedState(EntityPlayerMP player, IKnockdownsPlayerData data) { diff --git a/src/main/resources/assets/knockdowns/lang/en_us.lang b/src/main/resources/assets/knockdowns/lang/en_us.lang new file mode 100644 index 0000000..a9042b8 --- /dev/null +++ b/src/main/resources/assets/knockdowns/lang/en_us.lang @@ -0,0 +1,65 @@ +knockdowns.key.category=Knockdowns +knockdowns.key.callout.danger=Call out "Danger!" +knockdowns.key.callout.booyah=Call out "Booyah!" +knockdowns.key.callout.this_way_help=Call out "This way!" ("Help!" when knocked down) +knockdowns.key.callout.ouch=Call out "Ouch..." + +knockdowns.callout.danger=Danger! +knockdowns.callout.booyah=Booyah! +knockdowns.callout.this_way=This way! +knockdowns.callout.ouch=Ouch... +knockdowns.callout.help=Help! + +knockdowns.subtitles.callout=Player calls out +knockdowns.subtitles.knocked_down=Player knocked down + +knockdown.fell.accident.ladder=%1$s was knocked down by falling off a ladder +knockdown.fell.accident.vines=%1$s was knocked down by falling off some vines +knockdown.fell.accident.water=%1$s was knocked down by falling out of the water +knockdown.fell.accident.generic=%1$s was knocked down by a fall +knockdown.fell.killer=%1$s was doomed to get knocked down +knockdown.fell.assist=%1$s was doomed to get knocked down by %2$s +knockdown.fell.assist.item=%1$s was doomed to get knocked down by %2$s using %3$s +knockdown.fell.finish=%1$s fell too far and was knocked down by %2$s +knockdown.fell.finish.item=%1$s fell too far and was knocked down by %2$s using %3$s + +knockdown.attack.lightningBolt=%1$s was knocked down by lightning +knockdown.attack.inFire=%1$s was knocked down by the fire below +knockdown.attack.inFire.player=%1$s was knocked down by the fire below whilst fighting %2$s +knockdown.attack.onFire=%1$s was knocked down by fire +knockdown.attack.onFire.player=%1$s was knocked down by fire whilst fighting %2$s +knockdown.attack.lava=%1$s was knocked down by lava +knockdown.attack.lava.player=%1$s was knocked down by lava to escape %2$s +knockdown.attack.hotFloor=%1$s was knocked down by the floor +knockdown.attack.hotFloor.player=%1$s was knocked down by the floor due to %2$s +knockdown.attack.inWall=%1$s was knocked down by a wall +knockdown.attack.cramming=%1$s was knocked down by social anxiety +knockdown.attack.drown=%1$s was knocked down by lack of air +knockdown.attack.drown.player=%1$s was knocked down by lack of air whilst trying to escape %2$s +knockdown.attack.starve=%1$s was knocked down by hunger +knockdown.attack.cactus=%1$s was knocked down by a cactus +knockdown.attack.cactus.player=%1$s was knocked down by a cactus whilst trying to escape %2$s +knockdown.attack.generic=%1$s was knocked down +knockdown.attack.explosion=%1$s was knocked down by an explosion +knockdown.attack.explosion.player=%1$s was knocked down by an explosion due to %2$s +knockdown.attack.magic=%1$s was knocked down by magic +knockdown.attack.wither=%1$s was knocked down by withering +knockdown.attack.anvil=%1$s was knocked down by a falling anvil +knockdown.attack.fallingBlock=%1$s was knocked down by a falling block +knockdown.attack.mob=%1$s was knocked down by %2$s +knockdown.attack.player=%1$s was knocked down by %2$s +knockdown.attack.player.item=%1$s was knocked down by %2$s using %3$s +knockdown.attack.arrow=%1$s was knocked down by an arrow shot by %2$s +knockdown.attack.arrow.item=%1$s was knocked down by an arrow shot by %2$s using %3$s +knockdown.attack.fireball=%1$s was knocked down by a fireball shot by %2$s +knockdown.attack.fireball.item=%1$s was knocked down by a fireball shot by %2$s using %3$s +knockdown.attack.thrown=%1$s was knocked down after being pummeled by %2$s +knockdown.attack.thrown.item=%1$s was knocked down after being pummeled by %2$s using %3$s +knockdown.attack.indirectMagic=%1$s was knocked down by %2$s using magic +knockdown.attack.indirectMagic.item=%1$s was knocked down by %2$s using %3$s +knockdown.attack.thorns=%1$s was knocked down trying to hurt %2$s +knockdown.attack.fall=%1$s was knocked down by the ground below +knockdown.attack.outOfWorld=%1$s was knocked down by the void +knockdown.attack.dragonBreath=%1$s was knocked down by dragon breath +knockdown.attack.flyIntoWall=%1$s was knocked down by physics +knockdown.attack.fireworks=%1$s was knocked down by a firework diff --git a/src/main/resources/assets/knockdowns/sounds.json b/src/main/resources/assets/knockdowns/sounds.json new file mode 100755 index 0000000..fabd199 --- /dev/null +++ b/src/main/resources/assets/knockdowns/sounds.json @@ -0,0 +1,18 @@ +{ + "callout": { + "subtitle": "knockdowns.subtitles.callout", + "sounds": [ + { + "name": "knockdowns:callout" + } + ] + }, + "knocked_down": { + "subtitle": "knockdowns.subtitles.knocked_down", + "sounds": [ + { + "name": "knockdowns:knocked_down" + } + ] + } +} diff --git a/src/main/resources/assets/knockdowns/sounds/callout.ogg b/src/main/resources/assets/knockdowns/sounds/callout.ogg new file mode 100644 index 0000000..93c71da Binary files /dev/null and b/src/main/resources/assets/knockdowns/sounds/callout.ogg differ diff --git a/src/main/resources/assets/knockdowns/sounds/knocked_down.ogg b/src/main/resources/assets/knockdowns/sounds/knocked_down.ogg new file mode 100755 index 0000000..742eb84 Binary files /dev/null and b/src/main/resources/assets/knockdowns/sounds/knocked_down.ogg differ diff --git a/src/main/resources/assets/knockdowns/textures/gui/down_arrow.png b/src/main/resources/assets/knockdowns/textures/gui/down_arrow.png new file mode 100644 index 0000000..44a550d Binary files /dev/null and b/src/main/resources/assets/knockdowns/textures/gui/down_arrow.png differ diff --git a/src/main/resources/assets/knockdowns/textures/gui/knocked_icon.png b/src/main/resources/assets/knockdowns/textures/gui/knocked_icon.png new file mode 100755 index 0000000..d61f41c Binary files /dev/null and b/src/main/resources/assets/knockdowns/textures/gui/knocked_icon.png differ diff --git a/src/main/resources/assets/knockdowns/textures/gui/left_arrow.png b/src/main/resources/assets/knockdowns/textures/gui/left_arrow.png new file mode 100644 index 0000000..4badc50 Binary files /dev/null and b/src/main/resources/assets/knockdowns/textures/gui/left_arrow.png differ diff --git a/src/main/resources/assets/knockdowns/textures/gui/right_arrow.png b/src/main/resources/assets/knockdowns/textures/gui/right_arrow.png new file mode 100644 index 0000000..d62e7ca Binary files /dev/null and b/src/main/resources/assets/knockdowns/textures/gui/right_arrow.png differ diff --git a/src/main/resources/assets/knockdowns/textures/gui/up_arrow.png b/src/main/resources/assets/knockdowns/textures/gui/up_arrow.png new file mode 100644 index 0000000..56e803b Binary files /dev/null and b/src/main/resources/assets/knockdowns/textures/gui/up_arrow.png differ